Merge "msm7627a: Ensure that adb is disabled by default in -user builds"

75406d33 · Linux Build Service Account · Gerrit - the friendly Code Review server · 5d6afc9b · 4e2ae375 · 75406d33
Commit 75406d33 authored 12 years ago by Linux Build Service Account Committed by Gerrit - the friendly Code Review server 12 years ago
--- a/patch/ics_strawberry/system/core/msm7627a-Ensure-that-adb-is-disabled-by-default-in-user-builds.patch
+++ b/patch/ics_strawberry/system/core/msm7627a-Ensure-that-adb-is-disabled-by-default-in-user-builds.patch
+diff --git a/rootdir/etc/init.qcom.usb.sh b/rootdir/etc/init.qcom.usb.sh
+index 82d8eca..3c31cd7 100644
+--- a/rootdir/etc/init.qcom.usb.sh
+++ b/rootdir/etc/init.qcom.usb.sh
+@@ -104,7 +104,11 @@ case "$usb_config" in
+                 esac
+             ;;
+             "msm7627a")
+-                setprop persist.sys.usb.config diag,serial_smd,serial_tty,rmnet_smd,mass_storage,adb
+                if [ -z $usb_config ]; then
+                     setprop persist.sys.usb.config diag,serial_smd,serial_tty,rmnet_smd,mass_storage
+                else
+                     setprop persist.sys.usb.config diag,serial_smd,serial_tty,rmnet_smd,mass_storage,adb
+                fi
+             ;;
+             * )
+                 case "$baseband" in