Clean up USB Manager dump.

Tidy up the dump() implementation in preparation for further work.

Bug: 21615151
Change-Id: If6d94c8dc9457b8e93103541ec1798981eeb5b54

services/usb/java/com/android/server/usb/UsbAlsaManager.java

@@ -35,6 +35,7 @@ import android.util.Slog;
 
 import com.android.internal.alsa.AlsaCardsParser;
 import com.android.internal.alsa.AlsaDevicesParser;
+import com.android.internal.util.IndentingPrintWriter;
 import com.android.server.audio.AudioService;
 
 import libcore.io.IoUtils;
@@ -502,7 +503,7 @@ public final class UsbAlsaManager {
     //
     // Logging
     //
-    public void dump(FileDescriptor fd, PrintWriter pw) {
+    public void dump(IndentingPrintWriter pw) {
         pw.println("USB Audio Devices:");
         for (UsbDevice device : mAudioDevices.keySet()) {
             pw.println("  " + device.getDeviceName() + ": " + mAudioDevices.get(device));

services/usb/java/com/android/server/usb/UsbDebuggingManager.java

@@ -38,6 +38,7 @@ import android.util.Base64;
 import android.util.Slog;
 
 import com.android.internal.R;
+import com.android.internal.util.IndentingPrintWriter;
 import com.android.server.FgThread;
 
 import java.io.File;
@@ -451,7 +452,7 @@ public class UsbDebuggingManager {
         mHandler.sendEmptyMessage(UsbDebuggingHandler.MESSAGE_ADB_CLEAR);
     }
 
-    public void dump(FileDescriptor fd, PrintWriter pw) {
+    public void dump(IndentingPrintWriter pw) {
         pw.println("USB Debugging State:");
         pw.println("  Connected to adbd: " + (mThread != null));
         pw.println("  Last key received: " + mFingerprints);

services/usb/java/com/android/server/usb/UsbDeviceManager.java

@@ -45,6 +45,7 @@ import android.util.Pair;
 import android.util.Slog;
 
 import com.android.internal.annotations.GuardedBy;
+import com.android.internal.util.IndentingPrintWriter;
 import com.android.server.FgThread;
 
 import java.io.File;
@@ -807,7 +808,7 @@ public class UsbDeviceManager {
                     UsbManager.USB_FUNCTION_ADB);
         }
 
-        public void dump(FileDescriptor fd, PrintWriter pw) {
+        public void dump(IndentingPrintWriter pw) {
             pw.println("USB Device State:");
             pw.println("  mCurrentFunctions: " + mCurrentFunctions);
             pw.println("  mCurrentFunctionsApplied: " + mCurrentFunctionsApplied);
@@ -908,12 +909,12 @@ public class UsbDeviceManager {
         }
     }
 
-    public void dump(FileDescriptor fd, PrintWriter pw) {
+    public void dump(IndentingPrintWriter pw) {
         if (mHandler != null) {
-            mHandler.dump(fd, pw);
+            mHandler.dump(pw);
         }
         if (mDebuggingManager != null) {
-            mDebuggingManager.dump(fd, pw);
+            mDebuggingManager.dump(pw);
         }
     }
 

services/usb/java/com/android/server/usb/UsbHostManager.java

@@ -27,6 +27,7 @@ import android.os.ParcelFileDescriptor;
 import android.util.Slog;
 
 import com.android.internal.annotations.GuardedBy;
+import com.android.internal.util.IndentingPrintWriter;
 
 import java.io.FileDescriptor;
 import java.io.PrintWriter;
@@ -283,7 +284,7 @@ public class UsbHostManager {
         }
     }
 
-    public void dump(FileDescriptor fd, PrintWriter pw) {
+    public void dump(IndentingPrintWriter pw) {
         synchronized (mLock) {
             pw.println("USB Host State:");
             for (String name : mDevices.keySet()) {

services/usb/java/com/android/server/usb/UsbService.java

@@ -348,27 +348,27 @@ public class UsbService extends IUsbManager.Stub {
     @Override
     public void dump(FileDescriptor fd, PrintWriter writer, String[] args) {
         mContext.enforceCallingOrSelfPermission(android.Manifest.permission.DUMP, TAG);
-        final IndentingPrintWriter pw = new IndentingPrintWriter(writer, "  ");
 
+        final IndentingPrintWriter pw = new IndentingPrintWriter(writer, "  ");
         pw.println("USB Manager State:");
+        pw.increaseIndent();
         if (mDeviceManager != null) {
-            mDeviceManager.dump(fd, pw);
+            mDeviceManager.dump(pw);
         }
         if (mHostManager != null) {
-            mHostManager.dump(fd, pw);
+            mHostManager.dump(pw);
         }
-        mAlsaManager.dump(fd, pw);
+        mAlsaManager.dump(pw);
 
         synchronized (mLock) {
             for (int i = 0; i < mSettingsByUser.size(); i++) {
                 final int userId = mSettingsByUser.keyAt(i);
                 final UsbSettingsManager settings = mSettingsByUser.valueAt(i);
-                pw.increaseIndent();
                 pw.println("Settings for user " + userId + ":");
-                settings.dump(fd, pw);
+                pw.increaseIndent();
+                settings.dump(pw);
                 pw.decreaseIndent();
             }
         }
-        pw.decreaseIndent();
     }
 }

services/usb/java/com/android/server/usb/UsbSettingsManager.java

@@ -44,6 +44,7 @@ import android.util.Xml;
 
 import com.android.internal.content.PackageMonitor;
 import com.android.internal.util.FastXmlSerializer;
+import com.android.internal.util.IndentingPrintWriter;
 import com.android.internal.util.XmlUtils;
 
 import org.xmlpull.v1.XmlPullParser;
@@ -1193,7 +1194,7 @@ class UsbSettingsManager {
         }
     }
 
-    public void dump(FileDescriptor fd, PrintWriter pw) {
+    public void dump(IndentingPrintWriter pw) {
         synchronized (mLock) {
             pw.println("Device permissions:");
             for (String deviceName : mDevicePermissionMap.keySet()) {
@@ -1203,7 +1204,7 @@ class UsbSettingsManager {
                 for (int i = 0; i < count; i++) {
                     pw.print(Integer.toString(uidList.keyAt(i)) + " ");
                 }
-                pw.println("");
+                pw.println();
             }
             pw.println("Accessory permissions:");
             for (UsbAccessory accessory : mAccessoryPermissionMap.keySet()) {
@@ -1213,7 +1214,7 @@ class UsbSettingsManager {
                 for (int i = 0; i < count; i++) {
                     pw.print(Integer.toString(uidList.keyAt(i)) + " ");
                 }
-                pw.println("");
+                pw.println();
             }
             pw.println("Device preferences:");
             for (DeviceFilter filter : mDevicePreferenceMap.keySet()) {