summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorjames.wei@intel.com <james.wei@intel.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-12 09:20:30 +0000
committerjames.wei@intel.com <james.wei@intel.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-12 09:20:30 +0000
commitd2fb312db2df1a5f36e596a89cd89271ba6931e4 (patch)
tree05ea5ae3738276f95da713b1a4ddae4e0be6506e /build
parentc7e948b4578d55a52199adad9f38e73f70fe7a28 (diff)
downloadchromium_src-d2fb312db2df1a5f36e596a89cd89271ba6931e4.zip
chromium_src-d2fb312db2df1a5f36e596a89cd89271ba6931e4.tar.gz
chromium_src-d2fb312db2df1a5f36e596a89cd89271ba6931e4.tar.bz2
init AndroidCommand after the device online to root it
AndroidCommand object will root the device when it is created. If this happened before the device is online, error will appear. BUG= TEST= Review URL: https://chromiumcodereview.appspot.com/10695170 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146306 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rwxr-xr-xbuild/android/emulator.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/build/android/emulator.py b/build/android/emulator.py
index 6b53416..86788ac 100755
--- a/build/android/emulator.py
+++ b/build/android/emulator.py
@@ -196,7 +196,6 @@ class Emulator(object):
After confirming a wait-for-device can be successful, make sure
it returns the right answer.
"""
- a = android_commands.AndroidCommands(self.device)
seconds_waited = 0
number_of_waits = 2 # Make sure we can wfd twice
adb_cmd = "adb -s %s %s" % (self.device, 'wait-for-device')
@@ -221,7 +220,7 @@ class Emulator(object):
if wait_for_boot:
# Now that we checked for obvious problems, wait for a boot complete.
# Waiting for the package manager is sometimes problematic.
- a.Adb().SetTargetSerial(self.device)
+ a = android_commands.AndroidCommands(self.device)
a.Adb().WaitForSystemBootCompleted(self._WAITFORBOOT_TIMEOUT)
def Shutdown(self):