diff options
| author | Roman Birg <roman@cyngn.com> | 2015-06-23 07:06:33 -0700 |
|---|---|---|
| committer | Pat Erley <perley@cyngn.com> | 2015-07-29 15:43:19 -0700 |
| commit | 13ecae32c0293b44ef7514d8b6df8de957a65325 (patch) | |
| tree | 8aef3d4850c31f04b9f938152085a7c607a57b9a | |
| parent | b245997e66d275ea5df03b5289bb18db218356ff (diff) | |
| download | android_packages_apps_CMFileManager-13ecae32c0293b44ef7514d8b6df8de957a65325.tar.gz android_packages_apps_CMFileManager-13ecae32c0293b44ef7514d8b6df8de957a65325.tar.bz2 android_packages_apps_CMFileManager-13ecae32c0293b44ef7514d8b6df8de957a65325.zip | |
Shell console: fix bug in shell output stream
The command is finished and the partial result may also have the command
exit code. When the partial stream does have the exit code, we were
writing *only* the contents of the exit code, but we need to write
everything *until* the exit code, keeping the contents intact.
LETTUCE-755
Change-Id: I5e7af1125270c394f42fe7661cbefdd98c6a6052
Signed-off-by: Roman Birg <roman@cyngn.com>
(cherry picked from commit 22b9eab32c066fd479ac1022d8dc51d1492f2ad7)
| -rw-r--r-- | src/com/cyanogenmod/filemanager/console/shell/ShellConsole.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/cyanogenmod/filemanager/console/shell/ShellConsole.java b/src/com/cyanogenmod/filemanager/console/shell/ShellConsole.java index 00a65be6..1ecdc82b 100644 --- a/src/com/cyanogenmod/filemanager/console/shell/ShellConsole.java +++ b/src/com/cyanogenmod/filemanager/console/shell/ShellConsole.java @@ -1236,7 +1236,7 @@ public abstract class ShellConsole extends Console implements Program.ProgramLis if (match != null) { partial.reset(); - partial.write(bytes, match[0], match[1]); + partial.write(bytes, 0, match[0]); } } return ret; |