From 67be7184762d17d243a9396dd9989369f7f7e0d1 Mon Sep 17 00:00:00 2001
From: Jeff Sharkey <jsharkey@android.com>
Date: Sun, 10 Jan 2016 14:30:44 -0700
Subject: [PATCH] Fix IndentingPrintWriter after JDK switch.

We needed to overload more methods.  Verified that tests pass.

Bug: 26191999
Change-Id: I2b75890239d3febf3411c4b7bb4df92a6d61f056
---
 .../internal/util/IndentingPrintWriter.java   | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/core/java/com/android/internal/util/IndentingPrintWriter.java b/core/java/com/android/internal/util/IndentingPrintWriter.java
index f1add27077ef0..696667c6202be 100644
--- a/core/java/com/android/internal/util/IndentingPrintWriter.java
+++ b/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();