From 1695653bb2aa1acac3162a25b7df1cf0f8427546 Mon Sep 17 00:00:00 2001 From: Jerry Zhang Date: Tue, 18 Oct 2016 00:01:27 +0000 Subject: [PATCH] Revert "Remove automatic adding of adb into default.prop" This reverts commit 3c51c2bc487e6dd68fe586aba01ceb5f55e44671. Bug: 32223614 Change-Id: I1addc93b175e9442d9fc2f5e7a557fe818201a27 --- tools/post_process_props.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tools/post_process_props.py b/tools/post_process_props.py index 6916faf1c3..9dcaadfd0d 100755 --- a/tools/post_process_props.py +++ b/tools/post_process_props.py @@ -33,6 +33,16 @@ def mangle_build_prop(prop): # Put the modifications that you need to make into the /default.prop into this # function. The prop object has get(name) and put(name,value) methods. def mangle_default_prop(prop): + # If ro.debuggable is 1, then enable adb on USB by default + # (this is for userdebug builds) + if prop.get("ro.debuggable") == "1": + val = prop.get("persist.sys.usb.config") + if "adb" not in val: + if val == "": + val = "adb" + else: + val = val + ",adb" + prop.put("persist.sys.usb.config", val) # UsbDeviceManager expects a value here. If it doesn't get it, it will # default to "adb". That might not the right policy there, but it's better # to be explicit.