From b8f1b5929801dbfed2bceb65859419d5cf4ddbd9 Mon Sep 17 00:00:00 2001
From: Adam He <adamhe@google.com>
Date: Thu, 30 May 2019 13:36:12 -0700
Subject: [PATCH] Reset session for augmented only on manual requests.

Bug: 132119724
Test: atest CtsAutoFillServiceTestCases
Test: atest android.autofillservice.cts.augmented.AugmentedLoginActivityTest#testAutoFill_notImportantForAutofill_thenManualRequest
Change-Id: I5d3bf867b4dca71c74aa76c8227196c26c01e145
---
 services/autofill/java/com/android/server/autofill/Session.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/services/autofill/java/com/android/server/autofill/Session.java b/services/autofill/java/com/android/server/autofill/Session.java
index 66b5437f0a7d0..af9b0e2aa7b11 100644
--- a/services/autofill/java/com/android/server/autofill/Session.java
+++ b/services/autofill/java/com/android/server/autofill/Session.java
@@ -2178,6 +2178,7 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState
     private void requestNewFillResponseOnViewEnteredIfNecessaryLocked(@NonNull AutofillId id,
             @NonNull ViewState viewState, int flags) {
         if ((flags & FLAG_MANUAL_REQUEST) != 0) {
+            mForAugmentedAutofillOnly = false;
             if (sDebug) Slog.d(TAG, "Re-starting session on view " + id + " and flags " + flags);
             requestNewFillResponseLocked(viewState, ViewState.STATE_RESTARTED_SESSION, flags);
             return;