Merge "Fix the bug to not request IME twice for augmented autofill only field"... (87ddd4e2) · Commits · e / os / android_frameworks_base

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

+35 −32

Original line number	Original line	Diff line number	Diff line
	@@ -645,33 +645,21 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState
	}		}

	/**		/**
	* Returns whether inline suggestions are enabled for Autofill.		* Returns whether inline suggestions are supported by Autofill provider (not augmented
			* Autofill provider).
	*/		*/
	private boolean isInlineSuggestionsEnabledLocked() {		private boolean isInlineSuggestionsEnabledByAutofillProviderLocked() {
	return mService.isInlineSuggestionsEnabled()		return mService.isInlineSuggestionsEnabled();
	\|\| mService.getRemoteInlineSuggestionRenderServiceLocked() != null;
	}		}

	/**		private boolean isInlineSuggestionRenderServiceAvailable() {
	* Ask the IME to make an inline suggestions request if enabled.		return mService.getRemoteInlineSuggestionRenderServiceLocked() != null;
	*/
	private void maybeRequestInlineSuggestionsRequestThenFillLocked(@NonNull ViewState viewState,
	int newState, int flags) {
	if (isInlineSuggestionsEnabledLocked()) {
	Consumer<InlineSuggestionsRequest> inlineSuggestionsRequestConsumer =
	mAssistReceiver.newAutofillRequestLocked(/isInlineRequest=/ true);
	if (inlineSuggestionsRequestConsumer != null) {
	mInlineSuggestionSession.onCreateInlineSuggestionsRequest(mCurrentViewId,
	inlineSuggestionsRequestConsumer);
	}
	} else {
	mAssistReceiver.newAutofillRequestLocked(/isInlineRequest=/ false);
	}
	requestNewFillResponseLocked(viewState, newState, flags);
	}		}

	/**		/**
	* Reads a new structure and then request a new fill response from the fill service.		* Reads a new structure and then request a new fill response from the fill service.
			*
			* <p> Also asks the IME to make an inline suggestions request if it's enabled.
	*/		*/
	@GuardedBy("mLock")		@GuardedBy("mLock")
	private void requestNewFillResponseLocked(@NonNull ViewState viewState, int newState,		private void requestNewFillResponseLocked(@NonNull ViewState viewState, int newState,
	@@ -717,6 +705,21 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState
	// structure is taken. This causes only one fill request per bust of focus changes.		// structure is taken. This causes only one fill request per bust of focus changes.
	cancelCurrentRequestLocked();		cancelCurrentRequestLocked();

			// Only ask IME to create inline suggestions request if Autofill provider supports it and
			// the render service is available.
			if (isInlineSuggestionsEnabledByAutofillProviderLocked()
			&& isInlineSuggestionRenderServiceAvailable()) {
			Consumer<InlineSuggestionsRequest> inlineSuggestionsRequestConsumer =
			mAssistReceiver.newAutofillRequestLocked(/isInlineRequest=/ true);
			if (inlineSuggestionsRequestConsumer != null) {
			mInlineSuggestionSession.onCreateInlineSuggestionsRequest(mCurrentViewId,
			inlineSuggestionsRequestConsumer);
			}
			} else {
			mAssistReceiver.newAutofillRequestLocked(/isInlineRequest=/ false);
			}

			// Now request the assist structure data.
	try {		try {
	final Bundle receiverExtras = new Bundle();		final Bundle receiverExtras = new Bundle();
	receiverExtras.putInt(EXTRA_REQUEST_ID, requestId);		receiverExtras.putInt(EXTRA_REQUEST_ID, requestId);
	@@ -2322,8 +2325,7 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState
	if ((flags & FLAG_MANUAL_REQUEST) != 0) {		if ((flags & FLAG_MANUAL_REQUEST) != 0) {
	mForAugmentedAutofillOnly = false;		mForAugmentedAutofillOnly = false;
	if (sDebug) Slog.d(TAG, "Re-starting session on view " + id + " and flags " + flags);		if (sDebug) Slog.d(TAG, "Re-starting session on view " + id + " and flags " + flags);
	maybeRequestInlineSuggestionsRequestThenFillLocked(viewState,		requestNewFillResponseLocked(viewState, ViewState.STATE_RESTARTED_SESSION, flags);
	ViewState.STATE_RESTARTED_SESSION, flags);
	return true;		return true;
	}		}

	@@ -2333,8 +2335,7 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState
	Slog.d(TAG, "Starting partition or augmented request for view id " + id + ": "		Slog.d(TAG, "Starting partition or augmented request for view id " + id + ": "
	+ viewState.getStateAsString());		+ viewState.getStateAsString());
	}		}
	maybeRequestInlineSuggestionsRequestThenFillLocked(viewState,		requestNewFillResponseLocked(viewState, ViewState.STATE_STARTED_PARTITION, flags);
	ViewState.STATE_STARTED_PARTITION, flags);
	return true;		return true;
	} else {		} else {
	if (sVerbose) {		if (sVerbose) {
	@@ -2458,8 +2459,7 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState
	// View is triggering autofill.		// View is triggering autofill.
	mCurrentViewId = viewState.id;		mCurrentViewId = viewState.id;
	viewState.update(value, virtualBounds, flags);		viewState.update(value, virtualBounds, flags);
	maybeRequestInlineSuggestionsRequestThenFillLocked(viewState,		requestNewFillResponseLocked(viewState, ViewState.STATE_STARTED_SESSION, flags);
	ViewState.STATE_STARTED_SESSION, flags);
	break;		break;
	case ACTION_VALUE_CHANGED:		case ACTION_VALUE_CHANGED:
	if (mCompatMode && (viewState.getState() & ViewState.STATE_URL_BAR) != 0) {		if (mCompatMode && (viewState.getState() & ViewState.STATE_URL_BAR) != 0) {
	@@ -3107,12 +3107,15 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState
	}, mService.getRemoteInlineSuggestionRenderServiceLocked());		}, mService.getRemoteInlineSuggestionRenderServiceLocked());
	};		};

	// There are 3 cases when augmented autofill should ask IME for a new request:		// When the inline suggestion render service is available, there are 2 cases when
	// 1. standard autofill provider is None		// augmented autofill should ask IME for inline suggestion request, because standard
	// 2. standard autofill provider doesn't support inline (and returns null response)		// autofill flow didn't:
	// 3. standard autofill provider supports inline, but isn't called because the field		// 1. the field is augmented autofill only (when standard autofill provider is None or
	// doesn't want autofill		// when it returns null response)
	if (mForAugmentedAutofillOnly \|\| !isInlineSuggestionsEnabledLocked()) {		// 2. standard autofill provider doesn't support inline suggestion
			if (isInlineSuggestionRenderServiceAvailable()
			&& (mForAugmentedAutofillOnly
			\|\| !isInlineSuggestionsEnabledByAutofillProviderLocked())) {
	if (sDebug) Slog.d(TAG, "Create inline request for augmented autofill");		if (sDebug) Slog.d(TAG, "Create inline request for augmented autofill");
	mInlineSuggestionSession.onCreateInlineSuggestionsRequest(mCurrentViewId,		mInlineSuggestionSession.onCreateInlineSuggestionsRequest(mCurrentViewId,
	/requestConsumer=/ requestAugmentedAutofill);		/requestConsumer=/ requestAugmentedAutofill);