Don't wipe data when provisioning non-rooted devices.

build/android/provision_devices.py

 #!/usr/bin/env python
 #
 # Copyright (c) 2013 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.
 
 """Provisions Android devices with settings required for bots.
 
 Usage:
   ./provision_devices.py [-d <device serial number>]
@@ skipping 118 matching lines @@
     device.RunShellCommand('restorecon %s' % dir_path, as_root=True)
     device.RunShellCommand('echo %s > %s' %
                            (adb_keys[0], constants.ADB_KEYS_FILE), as_root=True)
     for adb_key in adb_keys[1:]:
       device.RunShellCommand(
         'echo %s >> %s' % (adb_key, constants.ADB_KEYS_FILE), as_root=True)
     device.RunShellCommand('restorecon %s' % constants.ADB_KEYS_FILE,
                            as_root=True)
 
 
+def WipeDevicesIfPossible(devices):
+  devices_to_reboot = []
+  for device_serial in devices:
+    device = device_utils.DeviceUtils(device_serial)
+    if not device.old_interface.EnableAdbRoot():
+      continue
+    WipeDeviceData(device)
+    devices_to_reboot.append(device)
+
+  if devices_to_reboot:
+    try:
+      device_utils.DeviceUtils.parallel(devices_to_reboot).Reboot(True)
+    except errors.DeviceUnresponsiveError:
+      pass
+    for device_serial in devices_to_reboot:
+      device.WaitUntilFullyBooted(timeout=90)
+
+
 def ProvisionDevices(options):
   is_perf = 'perf' in os.environ.get('BUILDBOT_BUILDERNAME', '').lower()
   # TODO(jbudorick): Parallelize provisioning of all attached devices after
   # switching from AndroidCommands.
   if options.device is not None:
     devices = [options.device]
   else:
     devices = android_commands.GetAttachedDevices()
 
   # Wipe devices (unless --skip-wipe was specified)
   if not options.skip_wipe:
-    for device_serial in devices:
-      device = device_utils.DeviceUtils(device_serial)
-      device.old_interface.EnableAdbRoot()
-      WipeDeviceData(device)
-    try:
-      device_utils.DeviceUtils.parallel(devices).Reboot(True)
-    except errors.DeviceUnresponsiveError:
-      pass
-    for device_serial in devices:
-      device.WaitUntilFullyBooted(timeout=90)
+    WipeDevicesIfPossible(devices)
 
   # Provision devices
   for device_serial in devices:
     device = device_utils.DeviceUtils(device_serial)
     device.old_interface.EnableAdbRoot()
     _ConfigureLocalProperties(device, is_perf)
     device_settings_map = device_settings.DETERMINISTIC_DEVICE_SETTINGS
     if options.disable_location:
       device_settings_map.update(device_settings.DISABLE_LOCATION_SETTING)
     else:
@@ skipping 60 matching lines @@
 
   if args:
     print >> sys.stderr, 'Unused args %s' % args
     return 1
 
   ProvisionDevices(options)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))