diff options
author | 2018-12-10 09:44:23 -0800 | |
---|---|---|
committer | 2018-12-10 09:58:37 -0800 | |
commit | b718e0301ed2815f9fa7cb71978c410227dc927c (patch) | |
tree | 68582cd29a98652b8fcf9e301c7e6547ab8a89d8 | |
parent | 132b1c6002a6b5a5742a32852b515421ff95c57d (diff) |
Changed activity --intelligence option to --contentcapture
Test: adb shell dumpsys activity top --contentcapture
Bug: 111276913
Change-Id: Ie4986ba018b77ec5f03aa7fb4522b6b874ec7ebe
-rw-r--r-- | core/java/android/app/Activity.java | 16 | ||||
-rw-r--r-- | core/java/android/view/contentcapture/ContentCaptureManager.java | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index cfda8037072f..4c57d395315c 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -6763,8 +6763,8 @@ public class Activity extends ContextThemeWrapper case "--autofill": dumpAutofillManager(prefix, writer); return; - case "--intelligence": - dumpIntelligenceManager(prefix, writer); + case "--contentcapture": + dumpContentCaptureManager(prefix, writer); return; } } @@ -6796,7 +6796,7 @@ public class Activity extends ContextThemeWrapper 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 @@ public class Activity extends ContextThemeWrapper } } - 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 48831daf75e8..1889692ea831 100644 --- a/core/java/android/view/contentcapture/ContentCaptureManager.java +++ b/core/java/android/view/contentcapture/ContentCaptureManager.java @@ -422,7 +422,7 @@ public final class ContentCaptureManager { /** @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()); |