diff options
| author | Dan Albert <danalbert@google.com> | 2016-02-24 11:39:42 -0800 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2016-02-24 11:39:42 -0800 |
| commit | aaf5455b167d681bdf930bfd79e587a3b8068969 (patch) | |
| tree | 8a833edde3cc7ff6077f432ff30db821cc1033e8 /python-packages | |
| parent | 5ca14aa7777bd0a0e708a207c66bda9784026c57 (diff) | |
| download | android_development-aaf5455b167d681bdf930bfd79e587a3b8068969.tar.gz android_development-aaf5455b167d681bdf930bfd79e587a3b8068969.tar.bz2 android_development-aaf5455b167d681bdf930bfd79e587a3b8068969.zip | |
Add a fix for old, broken devices.
Not sure exactly why this happens, but it keeps cropping up on my JB
nakasi when running the NDK tests.
Change-Id: Ic5c35f9ab01c0a83f98a6d074220c89ec765a812
Diffstat (limited to 'python-packages')
| -rw-r--r-- | python-packages/adb/device.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/python-packages/adb/device.py b/python-packages/adb/device.py index 4a1361d9a..a10a85cdf 100644 --- a/python-packages/adb/device.py +++ b/python-packages/adb/device.py @@ -225,9 +225,10 @@ class AndroidDevice(object): _RETURN_CODE_PROBE = [';', 'echo', '{0}$?'.format(_RETURN_CODE_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( - '{0}255\r\n'.format(_RETURN_CODE_DELIMITER)) + '{0}255\r\r\n'.format(_RETURN_CODE_DELIMITER)) # Feature name strings. SHELL_PROTOCOL_FEATURE = 'shell_v2' |