Merge "Try augmented autofill if regular autofill is disabled." into qt-dev

am: e33ff60894

Change-Id: I05e68a72367bb69a9dcdda6125ec31cc02e9c173
This commit is contained in:
Adam He
2019-06-10 19:52:18 -07:00
committed by android-build-merger

View File

@@ -569,12 +569,13 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState
@GuardedBy("mLock") @GuardedBy("mLock")
private void requestNewFillResponseLocked(@NonNull ViewState viewState, int newState, private void requestNewFillResponseLocked(@NonNull ViewState viewState, int newState,
int flags) { int flags) {
if (mForAugmentedAutofillOnly) { if (mForAugmentedAutofillOnly || mRemoteFillService == null) {
if (sVerbose) { if (sVerbose) {
Slog.v(TAG, "requestNewFillResponse(): triggering augmented autofill instead " Slog.v(TAG, "requestNewFillResponse(): triggering augmented autofill instead "
+ "(mForAugmentedAutofillOnly=" + mForAugmentedAutofillOnly + "(mForAugmentedAutofillOnly=" + mForAugmentedAutofillOnly
+ ", flags=" + flags + ")"); + ", flags=" + flags + ")");
} }
mForAugmentedAutofillOnly = true;
triggerAugmentedAutofillLocked(); triggerAugmentedAutofillLocked();
return; return;
} }