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

2023-05-19 15:21:30 +00:00
parent e778cbc5f1 63da86fe76
commit b0f15c0c77
1 changed files with 2 additions and 1 deletions
--- a/services/autofill/java/com/android/server/autofill/AutofillManagerServiceShellCommand.java
+++ b/services/autofill/java/com/android/server/autofill/AutofillManagerServiceShellCommand.java
@@ -349,7 +349,8 @@ public final class AutofillManagerServiceShellCommand extends ShellCommand {
    private int isFieldDetectionServiceEnabled(PrintWriter pw) {
        final int userId = getNextIntArgRequired();
        String name = mService.getFieldDetectionServiceName(userId);
-        boolean enabled = !TextUtils.isEmpty(name);
+        boolean pccFlagEnabled = mService.isPccClassificationFlagEnabled();
+        boolean enabled = (!TextUtils.isEmpty(name)) && pccFlagEnabled;
        pw.println(enabled);
        return 0;
    }