Merge "[Autofill] Fix getAutofillComponent returning null sometimes" into main

2 files changed, 17 insertions, 2 deletions

diff --git a/services/autofill/bugfixes.aconfig b/services/autofill/bugfixes.aconfig
index ec6c3b7ebf7a..68bb224ad166 100644
--- a/services/autofill/bugfixes.aconfig
+++ b/services/autofill/bugfixes.aconfig
@@ -64,6 +64,16 @@ flag {
 }
 
 flag {
+  name: "fix_get_autofill_component"
+  namespace: "autofill"
+  description: "Fix getAutofillComponent returning null, even when user has selected provider"
+  bug: "319503432"
+  metadata {
+    purpose: PURPOSE_BUGFIX
+  }
+}
+
+flag {
   name: "test_flag"
   namespace: "autofill"
   description: "Test flag "
diff --git a/services/autofill/java/com/android/server/autofill/AutofillManagerService.java b/services/autofill/java/com/android/server/autofill/AutofillManagerService.java
index cba8c66cd5e3..c68e54956c99 100644
--- a/services/autofill/java/com/android/server/autofill/AutofillManagerService.java
+++ b/services/autofill/java/com/android/server/autofill/AutofillManagerService.java
@@ -18,6 +18,7 @@ package com.android.server.autofill;
 
 import static android.Manifest.permission.MANAGE_AUTO_FILL;
 import static android.content.Context.AUTOFILL_MANAGER_SERVICE;
+import static android.service.autofill.Flags.fixGetAutofillComponent;
 import static android.view.autofill.AutofillManager.MAX_TEMP_AUGMENTED_SERVICE_DURATION_MS;
 import static android.view.autofill.AutofillManager.getSmartSuggestionModeToString;
 
@@ -1920,8 +1921,12 @@ public final class AutofillManagerService
 
             try {
                 synchronized (mLock) {
-                    final AutofillManagerServiceImpl service =
-                            peekServiceForUserWithLocalBinderIdentityLocked(userId);
+                    final AutofillManagerServiceImpl service;
+                    if (fixGetAutofillComponent()) {
+                        service = getServiceForUserWithLocalBinderIdentityLocked(userId);
+                    } else {
+                        service = peekServiceForUserWithLocalBinderIdentityLocked(userId);
+                    }
                     if (service != null) {
                         componentName = service.getServiceComponentName();
                     } else if (sVerbose) {