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

Merge "Changed activity --intelligence option to --contentcapture"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-12-11 19:27:34 +00:00
committed by Android (Google) Code Review
parent 0873aa0f10 b718e0301e
commit 1982ca78e3
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/java/android/app/Activity.java
View File

@@ -6755,8 +6755,8 @@ public class Activity extends ContextThemeWrapper
case "--autofill":
dumpAutofillManager(prefix, writer);
return;
case "--intelligence":
dumpIntelligenceManager(prefix, writer);
case "--contentcapture":
dumpContentCaptureManager(prefix, writer);
return;
}
}
@@ -6788,7 +6788,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);
}
@@ -6804,12 +6804,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");
}
}

2
core/java/android/view/contentcapture/ContentCaptureManager.java
View File

@@ -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());