From eab095fb2326177ecd2fa734b80b89ed758e5ce5 Mon Sep 17 00:00:00 2001
From: TYM Tsai <tymtsai@google.com>
Date: Tue, 26 May 2020 21:21:07 +0800
Subject: [PATCH] Fixes expired response does not work with augmented autofill

Augmented autofill does not request a new fill request after the old
response is expired

Bug: 157412832
Test: atest CteAutoFillServiceTestCases
Change-Id: I88d400119fbc602869dc23d8b9f6575eb56de2c5
---
 .../autofill/java/com/android/server/autofill/Session.java   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/services/autofill/java/com/android/server/autofill/Session.java b/services/autofill/java/com/android/server/autofill/Session.java
index 06c60a3d08eb4..37ed6f790c19b 100644
--- a/services/autofill/java/com/android/server/autofill/Session.java
+++ b/services/autofill/java/com/android/server/autofill/Session.java
@@ -2588,14 +2588,15 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState
                             id)) {
                         // Regular autofill handled the view and returned null response, but it
                         // triggered augmented autofill
-                        if (!isSameViewEntered) {
+                        if (!isSameViewEntered || mExpiredResponse) {
                             if (sDebug) Slog.d(TAG, "trigger augmented autofill.");
                             triggerAugmentedAutofillLocked(flags);
                         } else {
                             if (sDebug) Slog.d(TAG, "skip augmented autofill for same view.");
                         }
                         return;
-                    } else if (mForAugmentedAutofillOnly && isSameViewEntered) {
+                    } else if (mForAugmentedAutofillOnly && isSameViewEntered
+                            && !mExpiredResponse) {
                         // Regular autofill is disabled.
                         if (sDebug) Slog.d(TAG, "skip augmented autofill for same view.");
                         return;