Merge "Fixes sending multiple fill requests to the augmented service" (4d5c0b4f) · Commits · e / os / android_frameworks_base

services/autofill/java/com/android/server/autofill/Session.java

+3 −8

Original line number	Diff line number	Diff line
		@@ -2563,7 +2563,9 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState
		return;
		}

		if ((flags & FLAG_MANUAL_REQUEST) == 0 && mAugmentedAutofillableIds != null
		if (!isSameViewEntered
		&& (flags & FLAG_MANUAL_REQUEST) == 0
		&& mAugmentedAutofillableIds != null
		&& mAugmentedAutofillableIds.contains(id)) {
		// View was already reported when server could not handle a response, but it
		// triggered augmented autofill
		@@ -2577,13 +2579,6 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState

		requestNewFillResponseOnViewEnteredIfNecessaryLocked(id, viewState, flags);

		// Remove the UI if the ViewState has changed.
		if (!Objects.equals(mCurrentViewId, viewState.id)) {
		mUi.hideFillUi(this);
		mCurrentViewId = viewState.id;
		hideAugmentedAutofillLocked(viewState);
		}

		if (isSameViewEntered) {
		return;
		}