Merge "[Autofill] Fix getAutofillComponent returning null sometimes" into main (42dbd658) · Commits · e / os / android_frameworks_base

services/autofill/bugfixes.aconfig

+10 −0

Original line number	Diff line number	Diff line
		@@ -63,6 +63,16 @@ flag {
		bug: "334141398"
		}

		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"

+7 −2

Original line number	Diff line number	Diff line
		@@ -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) {