Merge "Fix hasEnabledAutofillServices() return wrong value after AutofillServie updated" into rvc-dev

1 files changed, 2 insertions, 6 deletions

diff --git a/services/autofill/java/com/android/server/autofill/AutofillManagerService.java b/services/autofill/java/com/android/server/autofill/AutofillManagerService.java
index 9432678b7d2b..42e859f9d713 100644
--- a/services/autofill/java/com/android/server/autofill/AutofillManagerService.java
+++ b/services/autofill/java/com/android/server/autofill/AutofillManagerService.java
@@ -1662,12 +1662,8 @@ public final class AutofillManagerService
                 @NonNull IResultReceiver receiver) {
             boolean enabled = false;
             synchronized (mLock) {
-                final AutofillManagerServiceImpl service = peekServiceForUserLocked(userId);
-                if (service != null) {
-                    enabled = Objects.equals(packageName, service.getServicePackageName());
-                } else if (sVerbose) {
-                    Slog.v(TAG, "isServiceEnabled(): no service for " + userId);
-                }
+                final AutofillManagerServiceImpl service = getServiceForUserLocked(userId);
+                enabled = Objects.equals(packageName, service.getServicePackageName());
             }
             send(receiver, enabled);
         }