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

Commit 7c6e9500 authored by Felipe Leme's avatar Felipe Leme Committed by android-build-merger
Browse files

Merge "Don't print contents of user-provided bundles." into pi-dev 

am: dac0fe91

Change-Id: I2abc3adc142b7ad4c4cc25e3a382d53cecec5002
parents 9e6836d7 dac0fe91

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

+1 −3
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package com.android.server.autofill; 
import static android.Manifest.permission.MANAGE_AUTO_FILL;

import static android.content.Context.AUTOFILL_MANAGER_SERVICE;



import static com.android.server.autofill.Helper.bundleToString;

import static com.android.server.autofill.Helper.sDebug;

import static com.android.server.autofill.Helper.sFullScreenMode;

import static com.android.server.autofill.Helper.sPartitionMaxCount;
@@ -193,8 +192,7 @@ public final class AutofillManagerService extends SystemService { 
                if (disabledBefore == disabledNow) {

                    // Nothing changed, do nothing.

                    if (sDebug) {

                        Slog.d(TAG, "Autofill restriction did not change for user " + userId + ": "

                                + bundleToString(newRestrictions));

                        Slog.d(TAG, "Autofill restriction did not change for user " + userId);

                        return;

                    }

                }

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

+0 −22
Original line number Diff line number Diff line
@@ -79,28 +79,6 @@ public final class Helper { 
        throw new UnsupportedOperationException("contains static members only");

    }



    static void append(StringBuilder builder, Bundle bundle) {

        if (bundle == null || !sVerbose) {

            builder.append("null");

            return;

        }

        final Set<String> keySet = bundle.keySet();

        builder.append("[Bundle with ").append(keySet.size()).append(" extras:");

        for (String key : keySet) {

            final Object value = bundle.get(key);

            builder.append(' ').append(key).append('=');

            builder.append((value instanceof Object[])

                    ? Arrays.toString((Objects[]) value) : value);

        }

        builder.append(']');

    }



    static String bundleToString(Bundle bundle) {

        final StringBuilder builder = new StringBuilder();

        append(builder, bundle);

        return builder.toString();

    }



    @Nullable

    static AutofillId[] toArray(@Nullable ArraySet<AutofillId> set) {

        if (set == null) return null;

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

+4 −2
Original line number Diff line number Diff line
@@ -2502,8 +2502,10 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState 
        }



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

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

                Helper.bundleToString(mClientState));

        if (mClientState != null) {

            pw.print(prefix); pw.println("mClientState: "); pw.print(mClientState.getSize()); pw

                .println(" items");

        }

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

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

        if (mUrlBar == null) {