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

Commit 2779c6c7 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Make sure the control target has a control"

parents 4b5b834e 3b3537e0

services/core/java/com/android/server/wm/InsetsSourceProvider.java

+5 −3
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ class InsetsSourceProvider { 
    private final InsetsSourceControl mFakeControl;

    private @Nullable InsetsSourceControl mControl;

    private @Nullable InsetsControlTarget mControlTarget;

    private @Nullable InsetsControlTarget mPendingControlTarget;

    private @Nullable InsetsControlTarget mFakeControlTarget;



    private @Nullable ControlAdapter mAdapter;
@@ -140,8 +141,9 @@ class InsetsSourceProvider { 
            mSource.setVisibleFrame(null);

        } else if (mControllable) {

            mWin.setControllableInsetProvider(this);

            if (mControlTarget != null) {

                updateControlForTarget(mControlTarget, true /* force */);

            if (mPendingControlTarget != null) {

                updateControlForTarget(mPendingControlTarget, true /* force */);

                mPendingControlTarget = null;

            }

        }

    }
@@ -245,7 +247,7 @@ class InsetsSourceProvider { 
            setWindow(null, null, null);

        }

        if (mWin == null) {

            mControlTarget = target;

            mPendingControlTarget = target;

            return;

        }

        if (target == mControlTarget && !force) {