am 3bc33423: am b35b8e81: am b3c11805: am 2dbccc19: Clean up USB Manager dump. (852e51e2) · Commits · e / os / android_frameworks_base

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

+6 −5

Original line number	Diff line number	Diff line
		@@ -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));

+7 −6

Original line number	Diff line number	Diff line
		@@ -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);

+13 −12

Original line number	Diff line number	Diff line
		@@ -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);
		}
		}

+4 −3

Original line number	Diff line number	Diff line
		@@ -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;
		@@ -285,7 +286,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()) {

+7 −7

Original line number	Diff line number	Diff line
		@@ -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();
		}
		}