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

Commit 369c2a13 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Correct the default value of mRequestedInsetsState" into rvc-dev am:... 

Merge "Correct the default value of mRequestedInsetsState" into rvc-dev am: 7a61fb6a am: b187e387 am: c284e8e6 am: 253b840d am: 4d44b6fc

Change-Id: Ied206211b45e4c02203aee3f7af7131662dbc892
parents 1ec2beb1 4d44b6fc

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

+1 −4
Original line number Original line Diff line number Diff line
@@ -658,7 +658,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 
    private boolean mIsDimming = false;

    private boolean mIsDimming = false;





    private @Nullable InsetsSourceProvider mControllableInsetProvider;

    private @Nullable InsetsSourceProvider mControllableInsetProvider;

    private InsetsState mRequestedInsetsState;

    private final InsetsState mRequestedInsetsState = new InsetsState();





    private static final float DEFAULT_DIM_AMOUNT_DEAD_WINDOW = 0.5f;

    private static final float DEFAULT_DIM_AMOUNT_DEAD_WINDOW = 0.5f;

    private KeyInterceptionInfo mKeyInterceptionInfo;

    private KeyInterceptionInfo mKeyInterceptionInfo;
@@ -817,9 +817,6 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 
        mSeq = seq;

        mSeq = seq;

        mPowerManagerWrapper = powerManagerWrapper;

        mPowerManagerWrapper = powerManagerWrapper;

        mForceSeamlesslyRotate = token.mRoundedCornerOverlay;

        mForceSeamlesslyRotate = token.mRoundedCornerOverlay;

        mRequestedInsetsState = new InsetsState(

                getDisplayContent().getInsetsPolicy().getInsetsForDispatch(this),

                true /* copySources */);

        if (DEBUG) {

        if (DEBUG) {

            Slog.v(TAG, "Window " + this + " client=" + c.asBinder()

            Slog.v(TAG, "Window " + this + " client=" + c.asBinder()

                            + " token=" + token + " (" + mAttrs.token + ")" + " params=" + a);

                            + " token=" + token + " (" + mAttrs.token + ")" + " params=" + a);