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

Commit 3b3537e0 authored by Tiger Huang's avatar Tiger Huang
Browse files

Make sure the control target has a control 

The CL only allows a target to be the control target if the insets
source provider has a control. This prevents the arrays in
InsetsStateController.mControlTargetTypeMap contains a type which
doesn't have a control. If an insets source provider haven't had
a window yet while we are updating control for target, we let the
target be the pending control target, and then use it to update again
while the provider get the window.

Bug: 149121559
Test: Manual test
Change-Id: I3c63e892f870f4daca667106d935e05423dfece8
parent e7f3f694

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