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

Merge "Fallback to the default platform password manager" into sc-dev

Browse Source
This commit is contained in:
TYM Tsai
2021-04-14 07:45:16 +00:00
committed by Android (Google) Code Review
parent 9bf277f905 17e04104d8
commit f379c17e98
1 changed files with 34 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -456,6 +456,12 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState
} : null;
}
void newAutofillRequestLocked(@Nullable InlineSuggestionsRequest inlineRequest) {
mPendingFillRequest = null;
mWaitForInlineRequest = inlineRequest != null;
mPendingInlineSuggestionsRequest = inlineRequest;
}
void maybeRequestFillLocked() {
if (mPendingFillRequest == null) {
return;
@@ -886,6 +892,11 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState
}
// Now request the assist structure data.
requestAssistStructureLocked(requestId, flags);
}
@GuardedBy("mLock")
private void requestAssistStructureLocked(int requestId, int flags) {
try {
final Bundle receiverExtras = new Bundle();
receiverExtras.putInt(EXTRA_REQUEST_ID, requestId);
@@ -1052,12 +1063,13 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState
if (requestLog != null) {
requestLog.addTaggedData(MetricsEvent.FIELD_AUTOFILL_NUM_DATASETS, -1);
}
processNullResponseLocked(requestId, requestFlags);
processNullResponseOrFallbackLocked(requestId, requestFlags);
return;
}
fieldClassificationIds = response.getFieldClassificationIds();
if (fieldClassificationIds != null && !mService.isFieldClassificationEnabledLocked()) {
if (!mSessionFlags.mClientSuggestionsEnabled && fieldClassificationIds != null
&& !mService.isFieldClassificationEnabledLocked()) {
Slog.w(TAG, "Ignoring " + response + " because field detection is disabled");
processNullResponseLocked(requestId, requestFlags);
return;
@@ -1136,6 +1148,26 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState
}
}
@GuardedBy("mLock")
private void processNullResponseOrFallbackLocked(int requestId, int flags) {
if (!mSessionFlags.mClientSuggestionsEnabled) {
processNullResponseLocked(requestId, flags);
return;
}
// fallback to the default platform password manager
mSessionFlags.mClientSuggestionsEnabled = false;
final InlineSuggestionsRequest inlineRequest =
(mLastInlineSuggestionsRequest != null
&& mLastInlineSuggestionsRequest.first == requestId)
? mLastInlineSuggestionsRequest.second : null;
mAssistReceiver.newAutofillRequestLocked(inlineRequest);
requestAssistStructureLocked(requestId,
flags & ~FLAG_ENABLED_CLIENT_SUGGESTIONS);
return;
}
// FillServiceCallbacks
@Override
public void onFillRequestFailure(int requestId, @Nullable CharSequence message) {