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

am: c82a2b5358 Change-Id: I9ff1746643acbbf8663b6e1c5fce553e4f803df4
2016-06-08 00:45:34 +00:00
parent 21c77ed1a8 c82a2b5358
commit 89b7934905
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()) {