LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix adb.py.

Browse Source 
oops

Change-Id: Id3e11ebc89d32f1d0a606047f9b69469fe701098
This commit is contained in:
Josh Gao
2016-03-29 11:28:36 -07:00
parent 5e26cab050
commit 016c18c73d
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
python-packages/adb/device.py
View File

@@ -228,10 +228,11 @@ def split_lines(s):
return re.split(r'[\r\n]+', s.rstrip())
def version(adb_path='adb'):
def version(adb_path=None):
"""Get the version of adb (in terms of ADB_SERVER_VERSION)."""
version_output = subprocess.check_output([adb_path, 'version'])
adb_path = adb_path if adb_path is not None else ['adb']
version_output = subprocess.check_output(adb_path + ['version'])
pattern = r'^Android Debug Bridge version 1.0.(\d+)$'
result = re.match(pattern, version_output.splitlines()[0])
if not result:
@@ -289,7 +290,7 @@ class AndroidDevice(object):
def _make_shell_cmd(self, user_cmd):
command = self.adb_cmd + ['shell'] + user_cmd
if self.has_shell_protocol():
if not self.has_shell_protocol():
command += self._RETURN_CODE_PROBE
return command