Index: build/android/pylib/device_settings.py |
diff --git a/build/android/pylib/device_settings.py b/build/android/pylib/device_settings.py |
index b79ada9f5d45f87c38ff1a1fa73ccbcab8b222dc..bc39b5d3aa307e6a80a23b8da8ce8de79385b81f 100644 |
--- a/build/android/pylib/device_settings.py |
+++ b/build/android/pylib/device_settings.py |
@@ -36,9 +36,6 @@ def ConfigureContentSettings(device, desired_settings): |
logging.error('Skipping content settings configuration due to outdated sdk') |
return |
- device.SetProp('persist.sys.usb.config', 'adb') |
- device.old_interface.WaitForDevicePm() |
- |
if device.GetProp('ro.build.type') == 'userdebug': |
for table, key_value in desired_settings: |
settings = content_settings.ContentSettings(table, device) |