am 6106f320: Merge "Do not add \'adb\' to persist.sys.usb.config if already there"

* commit '6106f320d3cf4b76774046faf2d843c5b13db593': Do not add 'adb' to persist.sys.usb.config if already there
2015-05-29 17:09:13 +00:00
parent a6b1466168 6106f320d3
commit d41093507b
1 changed files with 6 additions and 5 deletions
--- a/tools/post_process_props.py
+++ b/tools/post_process_props.py
@@ -37,6 +37,7 @@ def mangle_default_prop(prop):
  # (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: