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

Commit 8ed09f85 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Redact filter text when autofill UI is dumped, as it could contain PII."

parents c19d96c8 1359f562

services/autofill/java/com/android/server/autofill/Helper.java

+9 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import android.view.autofill.AutofillValue; 


import com.android.internal.logging.nano.MetricsProto.MetricsEvent;



import java.io.PrintWriter;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.Objects;
@@ -112,4 +113,12 @@ public final class Helper { 
        }

        return log;

    }



    public static void printlnRedactedText(@NonNull PrintWriter pw, @Nullable String text) {

        if (text == null) {

            pw.println("null");

        } else {

            pw.print(text.length()); pw.println("_chars");

        }

    }

}

services/autofill/java/com/android/server/autofill/ui/FillUi.java

+4 −1
Original line number Diff line number Diff line
@@ -49,6 +49,8 @@ import android.widget.RemoteViews; 


import com.android.internal.R;

import com.android.server.UiThread;

import com.android.server.autofill.Helper;



import libcore.util.Objects;



import java.io.PrintWriter;
@@ -466,7 +468,8 @@ final class FillUi { 
        pw.print(prefix); pw.print("mCallback: "); pw.println(mCallback != null);

        pw.print(prefix); pw.print("mListView: "); pw.println(mListView);

        pw.print(prefix); pw.print("mAdapter: "); pw.println(mAdapter != null);

        pw.print(prefix); pw.print("mFilterText: "); pw.println(mFilterText);

        pw.print(prefix); pw.print("mFilterText: ");

        Helper.printlnRedactedText(pw, mFilterText);

        pw.print(prefix); pw.print("mContentWidth: "); pw.println(mContentWidth);

        pw.print(prefix); pw.print("mContentHeight: "); pw.println(mContentHeight);

        pw.print(prefix); pw.print("mDestroyed: "); pw.println(mDestroyed);