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

Commit ef6e4203 authored by Simranjit Kohli's avatar Simranjit Kohli Committed by Automerger Merge Worker
Browse files

Merge "[Autofill PCC]: Add flag values during dump Modify dump for... 

Merge "[Autofill PCC]: Add flag values during dump Modify dump for AutofillManagerService to include flag values. Test: Manual dump check. Bug: 266379948" into udc-dev am: 18c529d0

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21916203



Change-Id: Ic825ae2af2e6b5eccf6de60807e365182ef29ed0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6fe7cab2 18c529d0

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

+15 −1
Original line number Diff line number Diff line
@@ -200,7 +200,11 @@ public final class AutofillManagerService 
    final AugmentedAutofillState mAugmentedAutofillState = new AugmentedAutofillState();



    /**

     * Lock used to synchronize access to flags.

     * Lock used to synchronize access to the flags.

     * DO NOT USE ANY OTHER LOCK while holding this lock.

     * NOTE: This lock should only be used for accessing flags. It should never call into other

     * methods holding another lock. It can lead to potential deadlock if it calls into a method

     * holding mLock.

     */

    private final Object mFlagLock = new Object();
@@ -1914,6 +1918,16 @@ public final class AutofillManagerService 
                synchronized (mLock) {

                    pw.print("sDebug: "); pw.print(realDebug);

                    pw.print(" sVerbose: "); pw.println(realVerbose);

                    pw.print("Flags: ");

                    synchronized (mFlagLock) {

                        pw.print("mPccClassificationEnabled="); pw.print(mPccClassificationEnabled);

                        pw.print(";");

                        pw.print("mPccPreferProviderOverPcc="); pw.print(mPccPreferProviderOverPcc);

                        pw.print(";");

                        pw.print("mPccUseFallbackDetection="); pw.print(mPccUseFallbackDetection);

                        pw.print(";");

                        pw.print("mPccProviderHints="); pw.println(mPccProviderHints);

                    }

                    // Dump per-user services

                    dumpLocked("", pw);

                    mAugmentedAutofillResolver.dumpShort(pw); pw.println();