Merge "Fixes expired response does not work with augmented autofill" into rvc-dev am: d06ca16bd2 (48b04125) · Commits · e / os / android_frameworks_base

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

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -2588,14 +2588,15 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState
	id)) {		id)) {
	// Regular autofill handled the view and returned null response, but it		// Regular autofill handled the view and returned null response, but it
	// triggered augmented autofill		// triggered augmented autofill
	if (!isSameViewEntered) {		if (!isSameViewEntered \|\| mExpiredResponse) {
	if (sDebug) Slog.d(TAG, "trigger augmented autofill.");		if (sDebug) Slog.d(TAG, "trigger augmented autofill.");
	triggerAugmentedAutofillLocked(flags);		triggerAugmentedAutofillLocked(flags);
	} else {		} else {
	if (sDebug) Slog.d(TAG, "skip augmented autofill for same view.");		if (sDebug) Slog.d(TAG, "skip augmented autofill for same view.");
	}		}
	return;		return;
	} else if (mForAugmentedAutofillOnly && isSameViewEntered) {		} else if (mForAugmentedAutofillOnly && isSameViewEntered
			&& !mExpiredResponse) {
	// Regular autofill is disabled.		// Regular autofill is disabled.
	if (sDebug) Slog.d(TAG, "skip augmented autofill for same view.");		if (sDebug) Slog.d(TAG, "skip augmented autofill for same view.");
	return;		return;