Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9dcb1257 authored by Adam He's avatar Adam He Committed by Automerger Merge Worker
Browse files

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

Change-Id: Ic878e401b1c5c7dc4b59ffb3ba7efa7ce89f6f49
parents 0f4f05eb a408006e

services/autofill/java/com/android/server/autofill/Session.java

+3 −3
Original line number Diff line number Diff line
@@ -2374,9 +2374,9 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState 
    @GuardedBy("mLock")

    private boolean shouldStartNewPartitionLocked(@NonNull AutofillId id) {

        final ViewState currentView = mViewStates.get(id);

        if (mResponses == null && currentView != null

                && (currentView.getState() & ViewState.STATE_PENDING_CREATE_INLINE_REQUEST) == 0) {

            return true;

        if (mResponses == null) {

            return currentView != null && (currentView.getState()

                    & ViewState.STATE_PENDING_CREATE_INLINE_REQUEST) == 0;

        }



        if (mExpiredResponse) {