Merge "Dumps bound and enabled services in a11yManagerService"

This commit is contained in:
TreeHugger Robot
2019-04-01 06:57:14 +00:00
committed by Android (Google) Code Review

View File

@@ -2552,6 +2552,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub
pw.append(", autoclickEnabled=" + userState.mIsAutoclickEnabled);
pw.append(", nonInteractiveUiTimeout=" + userState.mNonInteractiveUiTimeout);
pw.append(", interactiveUiTimeout=" + userState.mInteractiveUiTimeout);
pw.append(", installedServiceCount=" + userState.mInstalledServices.size());
if (mUiAutomationManager.isUiAutomationRunningLocked()) {
pw.append(", ");
mUiAutomationManager.dumpUiAutomationService(fd, pw, args);
@@ -2559,7 +2560,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub
}
pw.append("}");
pw.println();
pw.append(" services:{");
pw.append(" Bound services:{");
final int serviceCount = userState.mBoundServices.size();
for (int j = 0; j < serviceCount; j++) {
if (j > 0) {
@@ -2570,6 +2571,30 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub
AccessibilityServiceConnection service = userState.mBoundServices.get(j);
service.dump(fd, pw, args);
}
pw.println("}");
pw.append(" Enabled services:{");
Iterator<ComponentName> it = userState.mEnabledServices.iterator();
if (it.hasNext()) {
ComponentName componentName = it.next();
pw.append(componentName.toShortString());
while (it.hasNext()) {
componentName = it.next();
pw.append(", ");
pw.append(componentName.toShortString());
}
}
pw.println("}");
pw.append(" Binding services:{");
it = userState.mBindingServices.iterator();
if (it.hasNext()) {
ComponentName componentName = it.next();
pw.append(componentName.toShortString());
while (it.hasNext()) {
componentName = it.next();
pw.append(", ");
pw.append(componentName.toShortString());
}
}
pw.println("}]");
pw.println();
}
@@ -2585,6 +2610,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub
pw.append(window.toString());
pw.append(']');
}
pw.println();
}
}
}