commit 216e31cd8e1dde4ceea678de4aeef28e2bf9743c
author Tianjie Xu <xunchang@google.com> Thu Nov 07 11:22:06 2019 -0800
committer android-build-merger <android-build-merger@google.com> Thu Nov 07 11:22:06 2019 -0800
tree 116f0d40d2e2c3669bfa43aa31d31a9a20920eab
parent 1caaf1637951004baba62d720927a42d6750118c
parent 4e0d813e39471a8575a70e6ac71a1129e918b3e3

Merge "Stop setting usb config from recovery init script" am: 6105aa1a4a
am: 4e0d813e39

Change-Id: I5d6461df326ece34dbaac6216d0caa479397463b

etc/init.rc

diff --git a/etc/init.rc b/etc/init.rc
index 9786f61..d5b056a 100644
--- a/etc/init.rc
+++ b/etc/init.rc
@@ -95,14 +95,6 @@
 on property:service.adb.root=1
     restart adbd
 
-# Always start adbd on userdebug and eng builds
-on fs && property:ro.debuggable=1
-    setprop sys.usb.config adb
-
-# Also start adbd on user build with an unlocked bootloader
-on fs && property:ro.debuggable=0 && androidboot.verifiedbootstate=orange
-    setprop sys.usb.config adb
-
 on fs && property:sys.usb.configfs=1
     mount configfs none /config
     mkdir /config/usb_gadget/g1 0770 shell shell