am a169f3b4: Merge "adb: win32: fix unittest exit code parsing"

* commit 'a169f3b40167df757b24464ceddcfc0e2f548c4f':
  adb: win32: fix unittest exit code parsing
This commit is contained in:
Elliott Hughes 2015-08-19 03:43:09 +00:00 committed by Android Git Automerger
commit 2b0deb91c3
1 changed files with 2 additions and 1 deletions

View File

@ -112,7 +112,8 @@ class AndroidDevice(object):
_RETURN_CODE_PROBE_STRING = 'echo "{0}$?"'.format(_RETURN_CODE_DELIMITER)
# Maximum search distance from the output end to find the delimiter.
_RETURN_CODE_SEARCH_LENGTH = len('{0}255\n'.format(_RETURN_CODE_DELIMITER))
# adb on Windows returns \r\n even if adbd returns \n.
_RETURN_CODE_SEARCH_LENGTH = len('{0}255\r\n'.format(_RETURN_CODE_DELIMITER))
def __init__(self, serial, product=None):
self.serial = serial