Merge "Fix IndentingPrintWriter after JDK switch."

core/java/com/android/internal/util/IndentingPrintWriter.java

@@ -45,6 +45,8 @@ public class IndentingPrintWriter extends PrintWriter {
      */
     private boolean mEmptyLine = true;
 
+    private char[] mSingleChar = new char[1];
+
     public IndentingPrintWriter(Writer writer, String singleIndent) {
         this(writer, singleIndent, -1);
     }
@@ -77,6 +79,24 @@ public class IndentingPrintWriter extends PrintWriter {
         print(key + "=0x" + Integer.toHexString(value) + " ");
     }
 
+    @Override
+    public void println() {
+        write('\n');
+    }
+
+    @Override
+    public void write(int c) {
+        mSingleChar[0] = (char) c;
+        write(mSingleChar, 0, 1);
+    }
+
+    @Override
+    public void write(String s, int off, int len) {
+        final char[] buf = new char[len];
+        s.getChars(off, len - off, buf, 0);
+        write(buf, 0, len);
+    }
+
     @Override
     public void write(char[] buf, int offset, int count) {
         final int indentLength = mIndentBuilder.length();