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

Merge "Add a fix for old, broken devices."

Browse Source
This commit is contained in:
Dan Albert
2016-02-24 22:07:43 +00:00
committed by Gerrit Code Review
parent 62e5e156f6 aaf5455b16
commit 957b431d22
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -225,9 +225,10 @@ class AndroidDevice(object):
_RETURN_CODE_PROBE = [';', 'echo', '{0}$?'.format(_RETURN_CODE_DELIMITER)] _RETURN_CODE_PROBE = [';', 'echo', '{0}$?'.format(_RETURN_CODE_DELIMITER)]
# Maximum search distance from the output end to find the delimiter. # Maximum search distance from the output end to find the delimiter.
# adb on Windows returns \r\n even if adbd returns \n. # adb on Windows returns \r\n even if adbd returns \n. Some old devices
# seem to actually return \r\r\n.
_RETURN_CODE_SEARCH_LENGTH = len( _RETURN_CODE_SEARCH_LENGTH = len(
'{0}255\r\n'.format(_RETURN_CODE_DELIMITER)) '{0}255\r\r\n'.format(_RETURN_CODE_DELIMITER))
# Feature name strings. # Feature name strings.
SHELL_PROTOCOL_FEATURE = 'shell_v2' SHELL_PROTOCOL_FEATURE = 'shell_v2'