Merge "Fix logic in shouldStartNewPartition to avoid null responses." into rvc-dev am: a408006e19

Change-Id: I62b59f599a91581c48daa03d49e3f3fbe21c4129
This commit is contained in:
Adam He
2020-05-11 19:58:51 +00:00
committed by Automerger Merge Worker

View File

@@ -2374,9 +2374,9 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState
@GuardedBy("mLock") @GuardedBy("mLock")
private boolean shouldStartNewPartitionLocked(@NonNull AutofillId id) { private boolean shouldStartNewPartitionLocked(@NonNull AutofillId id) {
final ViewState currentView = mViewStates.get(id); final ViewState currentView = mViewStates.get(id);
if (mResponses == null && currentView != null if (mResponses == null) {
&& (currentView.getState() & ViewState.STATE_PENDING_CREATE_INLINE_REQUEST) == 0) { return currentView != null && (currentView.getState()
return true; & ViewState.STATE_PENDING_CREATE_INLINE_REQUEST) == 0;
} }
if (mExpiredResponse) { if (mExpiredResponse) {