Splitting up wait_for_device into two pieces

infra/bots/flavor/android_flavor.py

 #!/usr/bin/env python

[borenet, 2016/03/25 11:40:57]

FTR this file is going away very soon.  It may not be worth making changes here.

 #
 # Copyright 2016 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 
 import android_devices
 import default_flavor
 import os
@@ skipping 12 matching lines @@
 
   def wait_for_device(self):
     """Run 'adb wait-for-device'."""
     self._wait_count += 1
     cmd = [
         os.path.join(self._android_flavor.android_bin, 'adb_wait_for_device'),
         '-s', self._serial,
     ]
     self._android_flavor._bot_info.run(
         cmd, env=self._android_flavor._default_env)
+    cmd = [
+        os.path.join(self._android_flavor.android_bin, 'adb_wait_for_charge'),
+        '-s', self._serial,
+    ]
+    self._android_flavor._bot_info.run(
+        cmd, env=self._android_flavor._default_env)
 
   def maybe_wait_for_device(self):
     """Run 'adb wait-for-device' if it hasn't already been run."""
     if self._wait_count == 0:
       self.wait_for_device()
 
   def __call__(self, *args, **kwargs):
     self.maybe_wait_for_device()
     return self._android_flavor._bot_info.run(self._adb + args, **kwargs)
 
@@ skipping 188 matching lines @@
     )
     prefix = self.device_path_join(device_scratch_dir, 'skiabot', 'skia_')
     return default_flavor.DeviceDirs(
         dm_dir=prefix + 'dm',
         perf_data_dir=prefix + 'perf',
         resource_dir=prefix + 'resources',
         images_dir=prefix + 'images',
         skp_dir=prefix + 'skp/skps',
         tmp_dir=prefix + 'tmp_dir')