Only check if setup wizard is disabled if doing provision check.

build/android/buildbot/bb_device_status_check.py

Index: build/android/buildbot/bb_device_status_check.py
diff --git a/build/android/buildbot/bb_device_status_check.py b/build/android/buildbot/bb_device_status_check.py
index ae0bb4a7b18b1aed4be9c850c78651166b296bee..9ce2b82a21f0861eba5e04395ddd880e49254367 100755
--- a/build/android/buildbot/bb_device_status_check.py
+++ b/build/android/buildbot/bb_device_status_check.py
@@ -41,7 +41,6 @@ def DeviceInfo(serial, options):
   device_build_type = device_adb.GetBuildType()
   device_product_name = device_adb.GetProductName()
 
-  setup_wizard_disabled = device_adb.GetSetupWizardStatus() == 'DISABLED'

[mkosiba (inactive), 2013/08/30 13:13:33]

if you've taken the assert out in GetSetupWizardStatus then you could just
change it to say != 'ENABLED', right?

[navabi, 2013/08/30 15:53:10]

That would work too. But we would still be checking the property on the device
and then not using it. Let's say we have a new device that doesn't have that
property (or the name of the property changed).

While we would also need to fix it other places (e.g. android_commands.py), if
we didn't care about it anyway, we could at least run device status check
without having to worry about that property.

   battery = device_adb.GetBatteryInfo()
   install_output = GetCmdOutput(
     ['%s/build/android/adb_install_apk.py' % constants.DIR_SOURCE_ROOT, '--apk',
@@ -76,9 +75,10 @@ def DeviceInfo(serial, options):
   errors = []
   if battery_level < 15:
     errors += ['Device critically low in battery. Turning off device.']
-  if (not setup_wizard_disabled and device_build_type != 'user' and
-      not options.no_provisioning_check):
-    errors += ['Setup wizard not disabled. Was it provisioned correctly?']
+  if not options.no_provisioning_check:
+    setup_wizard_disabled = device_adb.GetSetupWizardStatus() == 'DISABLED'
+    if not setup_wizard_disabled and device_build_type != 'user':
+      errors += ['Setup wizard not disabled. Was it provisioned correctly?']
   if device_product_name == 'mantaray' and ac_power != 'true':
     errors += ['Mantaray device not connected to AC power.']
   # TODO(navabi): Insert warning once we have a better handle of what install