From 3ca2ba3811f1c1a76d3a08f3ff0b99ca270cf6d0 Mon Sep 17 00:00:00 2001
From: Adam He <adamhe@google.com>
Date: Mon, 10 Jun 2019 16:21:31 -0700
Subject: [PATCH] Try augmented autofill if regular autofill is disabled.

Fixes: 134914712
Test: atest android.autofillservice.cts.augmented
Change-Id: I7440bc4a9bff0b62b2625cd5bf24d3e276e4802c
---
 .../autofill/java/com/android/server/autofill/Session.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/services/autofill/java/com/android/server/autofill/Session.java b/services/autofill/java/com/android/server/autofill/Session.java
index af9b0e2aa7b11..3764ca4b7906c 100644
--- a/services/autofill/java/com/android/server/autofill/Session.java
+++ b/services/autofill/java/com/android/server/autofill/Session.java
@@ -569,12 +569,13 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState
     @GuardedBy("mLock")
     private void requestNewFillResponseLocked(@NonNull ViewState viewState, int newState,
             int flags) {
-        if (mForAugmentedAutofillOnly) {
+        if (mForAugmentedAutofillOnly || mRemoteFillService == null) {
             if (sVerbose) {
                 Slog.v(TAG, "requestNewFillResponse(): triggering augmented autofill instead "
                         + "(mForAugmentedAutofillOnly=" + mForAugmentedAutofillOnly
                         + ", flags=" + flags + ")");
             }
+            mForAugmentedAutofillOnly = true;
             triggerAugmentedAutofillLocked();
             return;
         }