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

Commit 1359f562 authored by Felipe Leme's avatar Felipe Leme
Browse files

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

Bug: no
Test: manual verification

Change-Id: I517ebac97a0a95e90a2f5d457e0f4d3ff70a6155
parent 41841376

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

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




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

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





import java.io.PrintWriter;

import java.util.ArrayList;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.Arrays;

import java.util.Objects;

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

        }

        return log;

        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 Original line Diff line number Diff line
@@ -49,6 +49,8 @@ import android.widget.RemoteViews; 




import com.android.internal.R;

import com.android.internal.R;

import com.android.server.UiThread;

import com.android.server.UiThread;

import com.android.server.autofill.Helper;



import libcore.util.Objects;

import libcore.util.Objects;





import java.io.PrintWriter;

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("mCallback: "); pw.println(mCallback != null);

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

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

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

        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("mContentWidth: "); pw.println(mContentWidth);

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

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

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

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