Fix for provisioning_devices failure on user builds.

build/android/pylib/device_settings.py

Index: build/android/pylib/device_settings.py
diff --git a/build/android/pylib/device_settings.py b/build/android/pylib/device_settings.py
index 29cf35d1e6283576f70456c8eb9c783aabb8113f..deb673b971dd9e8f9f736e197074a8f656b6f434 100644
--- a/build/android/pylib/device_settings.py
+++ b/build/android/pylib/device_settings.py
@@ -38,13 +38,14 @@ def ConfigureContentSettingsDict(device, desired_settings):
   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():
-      settings[key] = value
-    logging.info('\n%s %s', table, (80 - len(table)) * '-')
-    for key, value in sorted(settings.iteritems()):
-      logging.info('\t%s: %s', key, value)
+  if device.old_interface.GetBuildType() == 'userdebug':

[mstrum, 2014/06/24 18:54:35]

Could you change this to be != 'user' so it works for other variants (e.g. eng)?

+    for table, key_value in sorted(desired_settings.iteritems()):
+      settings = content_settings.ContentSettings(table, device)
+      for key, value in key_value.iteritems():
+        settings[key] = value
+      logging.info('\n%s %s', table, (80 - len(table)) * '-')
+      for key, value in sorted(settings.iteritems()):
+        logging.info('\t%s: %s', key, value)
 
 
 ENABLE_LOCATION_SETTING = {