Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up USB Manager dump.

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

Bug: 21615151
Change-Id: If6d94c8dc9457b8e93103541ec1798981eeb5b54
This commit is contained in:
Jeff Brown
2015-07-07 12:40:53 -07:00
parent 539f7ac7a1
commit 2dbccc1926
6 changed files with 49 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/usb/java/com/android/server/usb/UsbAlsaManager.java
View File

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

13
services/usb/java/com/android/server/usb/UsbDebuggingManager.java
View File

@@ -38,6 +38,7 @@ import android.util.Base64;
import android.util.Slog; import android.util.Slog;
import com.android.internal.R; import com.android.internal.R;
import com.android.internal.util.IndentingPrintWriter;
import com.android.server.FgThread; import com.android.server.FgThread;
import java.io.File; import java.io.File;
@@ -451,17 +452,17 @@ public class UsbDebuggingManager {
mHandler.sendEmptyMessage(UsbDebuggingHandler.MESSAGE_ADB_CLEAR); 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("USB Debugging State:");
pw.println(" Connected to adbd: " + (mThread != null)); pw.println(" Connected to adbd: " + (mThread != null));
pw.println(" Last key received: " + mFingerprints); pw.println(" Last key received: " + mFingerprints);
pw.println(" User keys:"); pw.println(" User keys:");
try { try {
pw.println(FileUtils.readTextFile(new File("/data/misc/adb/adb_keys"), 0, null)); pw.println(FileUtils.readTextFile(new File("/data/misc/adb/adb_keys"), 0, null));
} catch (IOException e) { } catch (IOException e) {
pw.println("IOException: " + e); pw.println("IOException: " + e);
} }
pw.println(" System keys:"); pw.println(" System keys:");
try { try {
pw.println(FileUtils.readTextFile(new File("/adb_keys"), 0, null)); pw.println(FileUtils.readTextFile(new File("/adb_keys"), 0, null));
} catch (IOException e) { } catch (IOException e) {

25
services/usb/java/com/android/server/usb/UsbDeviceManager.java
View File

@@ -45,6 +45,7 @@ import android.util.Pair;
import android.util.Slog; import android.util.Slog;
import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.GuardedBy;
import com.android.internal.util.IndentingPrintWriter;
import com.android.server.FgThread; import com.android.server.FgThread;
import java.io.File; import java.io.File;
@@ -807,17 +808,17 @@ public class UsbDeviceManager {
UsbManager.USB_FUNCTION_ADB); UsbManager.USB_FUNCTION_ADB);
} }
public void dump(FileDescriptor fd, PrintWriter pw) { public void dump(IndentingPrintWriter pw) {
pw.println(" USB Device State:"); pw.println("USB Device State:");
pw.println(" mCurrentFunctions: " + mCurrentFunctions); pw.println(" mCurrentFunctions: " + mCurrentFunctions);
pw.println(" mCurrentFunctionsApplied: " + mCurrentFunctionsApplied); pw.println(" mCurrentFunctionsApplied: " + mCurrentFunctionsApplied);
pw.println(" mConnected: " + mConnected); pw.println(" mConnected: " + mConnected);
pw.println(" mConfigured: " + mConfigured); pw.println(" mConfigured: " + mConfigured);
pw.println(" mCurrentAccessory: " + mCurrentAccessory); pw.println(" mCurrentAccessory: " + mCurrentAccessory);
try { try {
pw.println(" Kernel state: " pw.println(" Kernel state: "
+ FileUtils.readTextFile(new File(STATE_PATH), 0, null).trim()); + FileUtils.readTextFile(new File(STATE_PATH), 0, null).trim());
pw.println(" Kernel function list: " pw.println(" Kernel function list: "
+ FileUtils.readTextFile(new File(FUNCTIONS_PATH), 0, null).trim()); + FileUtils.readTextFile(new File(FUNCTIONS_PATH), 0, null).trim());
} catch (IOException e) { } catch (IOException e) {
pw.println("IOException: " + e); pw.println("IOException: " + e);
@@ -908,12 +909,12 @@ public class UsbDeviceManager {
} }
} }
public void dump(FileDescriptor fd, PrintWriter pw) { public void dump(IndentingPrintWriter pw) {
if (mHandler != null) { if (mHandler != null) {
mHandler.dump(fd, pw); mHandler.dump(pw);
} }
if (mDebuggingManager != null) { if (mDebuggingManager != null) {
mDebuggingManager.dump(fd, pw); mDebuggingManager.dump(pw);
} }
} }

7
services/usb/java/com/android/server/usb/UsbHostManager.java
View File

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

14
services/usb/java/com/android/server/usb/UsbService.java
View File

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

23
services/usb/java/com/android/server/usb/UsbSettingsManager.java
View File

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