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

Commit 221b336c authored by Craig Mautner's avatar Craig Mautner Committed by Android (Google) Code Review
Browse files

Merge "Account for windows on non-app display."

parents 15560a84 19ab828a

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

+7 −1
Original line number Diff line number Diff line
@@ -299,6 +299,7 @@ final class WindowState implements WindowManagerPolicy.WindowState { 


    boolean mHasSurface = false;



    boolean mNotOnAppsDisplay = false;

    DisplayContent  mDisplayContent;



    /** When true this window can be displayed on screens owther than mOwnerUid's */
@@ -430,6 +431,10 @@ final class WindowState implements WindowManagerPolicy.WindowState { 
        }

        mRootToken = appToken;

        mAppToken = appToken.appWindowToken;

        if (mAppToken != null) {

            final DisplayContent appDisplay = getDisplayContent();

            mNotOnAppsDisplay = displayContent != appDisplay;

        }



        mWinAnimator = new WindowStateAnimator(this);

        mWinAnimator.mAlpha = a.alpha;
@@ -717,7 +722,8 @@ final class WindowState implements WindowManagerPolicy.WindowState { 
    }



    public DisplayContent getDisplayContent() {

        return mAppToken == null ? mDisplayContent : getStack().getDisplayContent();

        return mAppToken == null || mNotOnAppsDisplay ?

                mDisplayContent : getStack().getDisplayContent();

    }



    public int getDisplayId() {