Changed activity --intelligence option to --contentcapture
Test: adb shell dumpsys activity top --contentcapture
Bug: 111276913
Change-Id: Ie4986ba018b77ec5f03aa7fb4522b6b874ec7ebe
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java
index cfda803..4c57d39 100644
--- a/core/java/android/app/Activity.java
+++ b/core/java/android/app/Activity.java
@@ -6763,8 +6763,8 @@
case "--autofill":
dumpAutofillManager(prefix, writer);
return;
- case "--intelligence":
- dumpIntelligenceManager(prefix, writer);
+ case "--contentcapture":
+ dumpContentCaptureManager(prefix, writer);
return;
}
}
@@ -6796,7 +6796,7 @@
mHandler.getLooper().dump(new PrintWriterPrinter(writer), prefix);
dumpAutofillManager(prefix, writer);
- dumpIntelligenceManager(prefix, writer);
+ dumpContentCaptureManager(prefix, writer);
ResourcesManager.getInstance().dump(prefix, writer);
}
@@ -6812,12 +6812,12 @@
}
}
- void dumpIntelligenceManager(String prefix, PrintWriter writer) {
- final ContentCaptureManager im = getContentCaptureManager();
- if (im != null) {
- im.dump(prefix, writer);
+ void dumpContentCaptureManager(String prefix, PrintWriter writer) {
+ final ContentCaptureManager cm = getContentCaptureManager();
+ if (cm != null) {
+ cm.dump(prefix, writer);
} else {
- writer.print(prefix); writer.println("No IntelligenceManager");
+ writer.print(prefix); writer.println("No ContentCaptureManager");
}
}
diff --git a/core/java/android/view/contentcapture/ContentCaptureManager.java b/core/java/android/view/contentcapture/ContentCaptureManager.java
index 48831da..1889692 100644
--- a/core/java/android/view/contentcapture/ContentCaptureManager.java
+++ b/core/java/android/view/contentcapture/ContentCaptureManager.java
@@ -422,7 +422,7 @@
/** @hide */
public void dump(String prefix, PrintWriter pw) {
- pw.print(prefix); pw.println("IntelligenceManager");
+ pw.print(prefix); pw.println("ContentCaptureManager");
final String prefix2 = prefix + " ";
pw.print(prefix2); pw.print("mContext: "); pw.println(mContext);
pw.print(prefix2); pw.print("user: "); pw.println(mContext.getUserId());