Merge "Revert "Turn off adb on user builds."" am: 7be6751e00 am: 41eb7e3542

Original change: https://android-review.googlesource.com/c/platform/build/+/1913436

Change-Id: I053944427aaf6e531f4662e6a389134581613364
This commit is contained in:
Albert Wang
2022-03-16 03:41:09 +00:00
committed by Automerger Merge Worker

View File

@@ -38,11 +38,6 @@ def mangle_build_prop(prop_list):
else:
val = val + ",adb"
prop_list.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.
if not prop_list.get_value("persist.sys.usb.config"):
prop_list.put("persist.sys.usb.config", "none")
def validate_grf_props(prop_list, sdk_version):
"""Validate GRF properties if exist.