commit d3a9bf5cf3d3c09de7b741ad791ac8e128e11773
author Tianjie Xu <xunchang@google.com> Thu Nov 07 11:34:37 2019 -0800
committer android-build-merger <android-build-merger@google.com> Thu Nov 07 11:34:37 2019 -0800
tree 360f34f53011c9110ea159310aabb86c988f5bf7
parent c9548fce847998d9b7c72cd9926078d7faf7fcc5
parent 216e31cd8e1dde4ceea678de4aeef28e2bf9743c

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

Change-Id: I23c949b684fe4f9b23b1895286cd672c5f109144

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