Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b718e030 authored by Felipe Leme's avatar Felipe Leme
Browse files

Changed activity --intelligence option to --contentcapture 

Test: adb shell dumpsys activity top --contentcapture
Bug: 111276913

Change-Id: Ie4986ba018b77ec5f03aa7fb4522b6b874ec7ebe
parent 132b1c60

core/java/android/app/Activity.java

+8 −8
Original line number Diff line number Diff line
@@ -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");

        }

    }

core/java/android/view/contentcapture/ContentCaptureManager.java

+1 −1
Original line number Diff line number Diff line
@@ -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());