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

Commit 28f350e3 authored by Tim Yu's avatar Tim Yu Committed by Automerger Merge Worker
Browse files

Merge "Fix failing Autofill CTS related to PCC. Cause: missing flag in pcc... 

Merge "Fix failing Autofill CTS related to PCC. Cause: missing flag in pcc enable query that makes tests think PCC is enabled even when it's not." into udc-dev am: b0f15c0c am: 3cccd3d6

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



Change-Id: I9f18c485195992019a1d346f68c4501b61447335
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3f938a40 3cccd3d6

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -349,7 +349,8 @@ public final class AutofillManagerServiceShellCommand extends ShellCommand { 
    private int isFieldDetectionServiceEnabled(PrintWriter pw) {

    private int isFieldDetectionServiceEnabled(PrintWriter pw) {

        final int userId = getNextIntArgRequired();

        final int userId = getNextIntArgRequired();

        String name = mService.getFieldDetectionServiceName(userId);

        String name = mService.getFieldDetectionServiceName(userId);

        boolean enabled = !TextUtils.isEmpty(name);

        boolean pccFlagEnabled = mService.isPccClassificationFlagEnabled();

        boolean enabled = (!TextUtils.isEmpty(name)) && pccFlagEnabled;

        pw.println(enabled);

        pw.println(enabled);

        return 0;

        return 0;

    }

    }