Merge "bootloader_message: Add helpers for handling IBootControl MergeStatus."
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