From 53f537f85a278d576a954491314eeb39dc716070 Mon Sep 17 00:00:00 2001
From: Tim Yu <yunicorn@google.com>
Date: Thu, 25 May 2023 20:31:44 +0000
Subject: [PATCH] Correct returns if PCC is enabled.

Before it was just using the general flags to see if the PCC enabled and
PCC service names are set to determine if PCC is enabled. This change
will get those values for the user instead.

Fixes: 283849162
Test: android.autofillservice.cts.dialog.LoginActivityTest
Change-Id: Id9baa2611ad9d1a8abf05896604609d2e35b7947
---
 .../server/autofill/AutofillManagerService.java      | 12 ++++++++++++
 .../autofill/AutofillManagerServiceShellCommand.java |  5 +----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/services/autofill/java/com/android/server/autofill/AutofillManagerService.java b/services/autofill/java/com/android/server/autofill/AutofillManagerService.java
index fc758cba617f5..1a57bc1b7a0d0 100644
--- a/services/autofill/java/com/android/server/autofill/AutofillManagerService.java
+++ b/services/autofill/java/com/android/server/autofill/AutofillManagerService.java
@@ -760,6 +760,18 @@ public final class AutofillManagerService
         return false;
     }
 
+    // Called by Shell command
+    boolean isFieldDetectionServiceEnabledForUser(@UserIdInt int userId) {
+        enforceCallingPermissionForManagement();
+        synchronized (mLock) {
+            final AutofillManagerServiceImpl service = getServiceForUserLocked(userId);
+            if (service != null) {
+                return service.isPccClassificationEnabled();
+            }
+        }
+        return false;
+    }
+
     // Called by Shell command
     String getFieldDetectionServiceName(@UserIdInt int userId) {
         enforceCallingPermissionForManagement();
diff --git a/services/autofill/java/com/android/server/autofill/AutofillManagerServiceShellCommand.java b/services/autofill/java/com/android/server/autofill/AutofillManagerServiceShellCommand.java
index cd6de8749f479..c66fb81f51c68 100644
--- a/services/autofill/java/com/android/server/autofill/AutofillManagerServiceShellCommand.java
+++ b/services/autofill/java/com/android/server/autofill/AutofillManagerServiceShellCommand.java
@@ -26,7 +26,6 @@ import android.os.RemoteCallback;
 import android.os.ShellCommand;
 import android.os.UserHandle;
 import android.service.autofill.AutofillFieldClassificationService.Scores;
-import android.text.TextUtils;
 import android.view.autofill.AutofillManager;
 
 import com.android.internal.os.IResultReceiver;
@@ -348,9 +347,7 @@ public final class AutofillManagerServiceShellCommand extends ShellCommand {
 
     private int isFieldDetectionServiceEnabled(PrintWriter pw) {
         final int userId = getNextIntArgRequired();
-        String name = mService.getFieldDetectionServiceName(userId);
-        boolean pccFlagEnabled = mService.isPccClassificationFlagEnabled();
-        boolean enabled = (!TextUtils.isEmpty(name)) && pccFlagEnabled;
+        boolean enabled = mService.isFieldDetectionServiceEnabledForUser(userId);
         pw.println(enabled);
         return 0;
     }