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

Merge changes Id15887ff,I78262baa into rvc-dev am: 48079ba38c

Browse Source 
Change-Id: I190468990d7aa035d933bd0491e37ff635941291
This commit is contained in:
TreeHugger Robot
2020-04-04 04:48:20 +00:00
committed by Automerger Merge Worker
parent 20f42a2c15 48079ba38c
commit 1e5f79ad2e
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -657,13 +657,21 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState
}
/**
* Reads a new structure and then request a new fill response from the fill service.
* Clears the existing response for the partition, reads a new structure, and then requests a
* new fill response from the fill service.
*
* <p> Also asks the IME to make an inline suggestions request if it's enabled.
*/
@GuardedBy("mLock")
private void requestNewFillResponseLocked(@NonNull ViewState viewState, int newState,
int flags) {
final FillResponse existingResponse = viewState.getResponse();
if (existingResponse != null) {
setViewStatesLocked(
existingResponse,
ViewState.STATE_INITIAL,
/* clearResponse= */ true);
}
mExpiredResponse = false;
if (mForAugmentedAutofillOnly || mRemoteFillService == null) {
if (sVerbose) {
@@ -3226,7 +3234,7 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState
}
/**
* Sets the state of all views in the given dataset and response.
* Sets the state and response of all views in the given dataset.
*/
@GuardedBy("mLock")
private void setViewStatesLocked(@Nullable FillResponse response, @NonNull Dataset dataset,
@@ -3241,10 +3249,10 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState
if (datasetId != null) {
viewState.setDatasetId(datasetId);
}
if (response != null) {
viewState.setResponse(response);
} else if (clearResponse) {
if (clearResponse) {
viewState.setResponse(null);
} else if (response != null) {
viewState.setResponse(response);
}
}
}