From 63da86fe765c01d6998cc8c8edcff7d8e848081e Mon Sep 17 00:00:00 2001
From: Tim Yu <yunicorn@google.com>
Date: Thu, 18 May 2023 18:42:23 +0000
Subject: [PATCH] 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.

Fixes: 282996294
Test: android.autofillservice.cts.dialog.LoginActivityTest
Change-Id: I337ad89e5ee782341049c40dc77a9e38f74f6d2c
---
 .../server/autofill/AutofillManagerServiceShellCommand.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/services/autofill/java/com/android/server/autofill/AutofillManagerServiceShellCommand.java b/services/autofill/java/com/android/server/autofill/AutofillManagerServiceShellCommand.java
index 4aeb4a4f84096..cd6de8749f479 100644
--- 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;
     }