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

Commit 07dfca8d 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: 9dcb1257

Change-Id: Ib26b65fff7d70c4fb9fa724bf7658dd5472801be
parents aa0527da 9dcb1257

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

+3 −3
Original line number Original line Diff line number Diff line
@@ -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) {