diff options
| author | David van Tonder <david.vantonder@gmail.com> | 2012-11-04 08:00:34 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.cyanogenmod.com> | 2012-11-04 08:00:34 -0800 |
| commit | b5ce06039365232bed538452f5dd98f97f2d7977 (patch) | |
| tree | 93d8d0beda1c76e4b50bc5ad2eb16699aa326ff5 | |
| parent | 8a0b4b79c2bde24cc34e2223db91d04052c5d02f (diff) | |
| parent | 8c8af16dd9ddc9aaa23a7e9c80692dc321b740b9 (diff) | |
| download | android_packages_apps_CMFileManager-b5ce06039365232bed538452f5dd98f97f2d7977.tar.gz android_packages_apps_CMFileManager-b5ce06039365232bed538452f5dd98f97f2d7977.tar.bz2 android_packages_apps_CMFileManager-b5ce06039365232bed538452f5dd98f97f2d7977.zip | |
Merge "CMFileManager : Fix duplicate debugging output" into jellybean
| -rw-r--r-- | src/com/cyanogenmod/filemanager/console/shell/ShellConsole.java | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/com/cyanogenmod/filemanager/console/shell/ShellConsole.java b/src/com/cyanogenmod/filemanager/console/shell/ShellConsole.java index b7ddf990..5374c828 100644 --- a/src/com/cyanogenmod/filemanager/console/shell/ShellConsole.java +++ b/src/com/cyanogenmod/filemanager/console/shell/ShellConsole.java @@ -727,16 +727,15 @@ public abstract class ShellConsole extends Console implements Program.ProgramLis if (finished) { if (!async) { - ShellConsole.this.toStdIn(sb.toString()); + ShellConsole.this.toStdIn(s); } //Notify the end notifyProcessFinished(); break; } - - if (!async) { - ShellConsole.this.toStdIn(sb.toString()); + if (!async && !finished) { + ShellConsole.this.toStdIn(s); } //Wait for buffer to be filled @@ -850,7 +849,7 @@ public abstract class ShellConsole extends Console implements Program.ProgramLis ((AsyncResultProgram)ShellConsole.this.mActiveCommand); program.parsePartialErrResult(s); } - toStdErr(sb.toString()); + toStdErr(s); //Wait for buffer to be filled try { |