Merge "Frameworks/base: Fix FastPrintWriter infinite loop" into nyc-dev

2016-06-08 00:38:59 +00:00
parent 4401e24add ce78b9e114
commit c82a2b5358
1 changed files with 1 additions and 1 deletions
--- a/core/java/com/android/internal/util/FastPrintWriter.java
+++ b/core/java/com/android/internal/util/FastPrintWriter.java
@@ -345,7 +345,7 @@ public class FastPrintWriter extends PrintWriter {
            if (mOutputStream != null) {
                CharBuffer charBuffer = CharBuffer.wrap(mText, 0, mPos);
                CoderResult result = mCharset.encode(charBuffer, mBytes, true);
-                while (true) {
+                while (!mIoError) {
                    if (result.isError()) {
                        throw new IOException(result.toString());
                    } else if (result.isOverflow()) {