Fix for provisioning_devices failure on user builds.

build/android/pylib/device_settings.py

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import logging
 
 from pylib import content_settings
 
 
 def ConfigureContentSettingsDict(device, desired_settings):
@@ skipping 20 matching lines @@
                       'ro.build.version.sdk'])
     return
 
   if sdk_version < 16:
     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():
-      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 = {
   'settings/secure': {
     # Ensure Geolocation is enabled and allowed for tests.
     'location_providers_allowed': 'gps,network',
   }
 }
 
 DISABLE_LOCATION_SETTING = {
@@ skipping 58 matching lines @@
   },
 }
 
 
 NETWORK_DISABLED_SETTINGS = {
   'settings/global': {
     'airplane_mode_on': 1,
     'wifi_on': 0,
   },
 }