Index: build/android/pylib/device_settings.py |
diff --git a/build/android/pylib/device_settings.py b/build/android/pylib/device_settings.py |
index a2db68c242c7af1cc0dd29306fe02e1dfbf54ae9..2c2adcefcda0633e894128e634d7dc662d96c9c3 100644 |
--- a/build/android/pylib/device_settings.py |
+++ b/build/android/pylib/device_settings.py |
@@ -35,6 +35,9 @@ def ConfigureContentSettingsDict(device, desired_settings): |
logging.error('Skipping content settings configuration due to outdated sdk') |
return |
+ device.old_interface.system_properties['persist.sys.usb.config'] = 'adb' |
+ device.old_interface.WaitForDevicePm() |
+ |
for table, key_value in sorted(desired_settings.iteritems()): |
settings = content_settings.ContentSettings(table, device) |
for key, value in key_value.iteritems(): |