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

Commit 26f4a3ea 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... 

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

Change-Id: I8960ea2c454a38c0f20a4c77c43ddbc4679a8f19
parents b6cb0703 005a74ff

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) {