Merge "Add ability to dump specific dependency controller" into qt-dev
diff --git a/packages/SystemUI/src/com/android/systemui/Dependency.java b/packages/SystemUI/src/com/android/systemui/Dependency.java
index a421940..4b338f7 100644
--- a/packages/SystemUI/src/com/android/systemui/Dependency.java
+++ b/packages/SystemUI/src/com/android/systemui/Dependency.java
@@ -484,8 +484,18 @@
// with Dependency#get.
getDependency(DumpController.class);
- pw.println("Dumping existing controllers:");
- mDependencies.values().stream().filter(obj -> obj instanceof Dumpable)
+ // If an arg is specified, try to dump the dependency
+ String controller = args != null && args.length > 1
+ ? args[1].toLowerCase()
+ : null;
+ if (controller != null) {
+ pw.println("Dumping controller=" + controller + ":");
+ } else {
+ pw.println("Dumping existing controllers:");
+ }
+ mDependencies.values().stream()
+ .filter(obj -> obj instanceof Dumpable && (controller == null
+ || obj.getClass().getName().toLowerCase().endsWith(controller)))
.forEach(o -> ((Dumpable) o).dump(fd, pw, args));
}
diff --git a/packages/SystemUI/src/com/android/systemui/SystemUIService.java b/packages/SystemUI/src/com/android/systemui/SystemUIService.java
index ac108be..dc1218d 100644
--- a/packages/SystemUI/src/com/android/systemui/SystemUIService.java
+++ b/packages/SystemUI/src/com/android/systemui/SystemUIService.java
@@ -77,9 +77,9 @@
((PluginManagerImpl) Dependency.get(PluginManager.class)).dump(fd, pw, args);
}
} else {
- String svc = args[0];
+ String svc = args[0].toLowerCase();
for (SystemUI ui: services) {
- String name = ui.getClass().getName();
+ String name = ui.getClass().getName().toLowerCase();
if (name.endsWith(svc)) {
ui.dump(fd, pw, args);
}