Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Always let standard autofill try on new partitions even if session was marked as augmented only." into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-06-17 21:50:50 +00:00
committed by Android (Google) Code Review
parent 5f9e20b375 87e5c629e8
commit 2b5ab22b9f
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
services/autofill/java/com/android/server/autofill/Session.java
View File

@@ -2648,6 +2648,10 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState
Slog.d(TAG, "Starting partition or augmented request for view id " + id + ": " Slog.d(TAG, "Starting partition or augmented request for view id " + id + ": "
+ viewState.getStateAsString()); + viewState.getStateAsString());
} }
// Fix to always let standard autofill start.
// Sometimes activity contain IMPORTANT_FOR_AUTOFILL_NO fields which marks session as
// augmentedOnly, but other fields are still fillable by standard autofill.
mSessionFlags.mAugmentedAutofillOnly = false;
requestNewFillResponseLocked(viewState, ViewState.STATE_STARTED_PARTITION, flags); requestNewFillResponseLocked(viewState, ViewState.STATE_STARTED_PARTITION, flags);
return true; return true;
} }
@@ -2847,12 +2851,18 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState
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: "
+ "same view entered");
}
} }
return; return;
} else if (mSessionFlags.mAugmentedAutofillOnly && isSameViewEntered) { } else if (mSessionFlags.mAugmentedAutofillOnly && isSameViewEntered) {
// 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: "
+ "standard autofill disabled.");
}
return; return;
} }
} }