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

Commit e920098f authored by Chong Zhang's avatar Chong Zhang Committed by Android (Google) Code Review
Browse files

Merge "Fix window disappearing when docking a second app"

parents 9e50b788 48a87a54

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

+1 −1
Original line number Diff line number Diff line
@@ -252,7 +252,7 @@ class Task implements DimLayer.DimLayerUser { 
        }



        int boundsChange = BOUNDS_CHANGE_NONE;

        if (mBounds.left != bounds.left || mBounds.right != bounds.right) {

        if (mBounds.left != bounds.left || mBounds.top != bounds.top) {

            boundsChange |= BOUNDS_CHANGE_POSITION;

        }

        if (mBounds.width() != bounds.width() || mBounds.height() != bounds.height()) {

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

+1 −1
Original line number Diff line number Diff line
@@ -10195,7 +10195,7 @@ public class WindowManagerService extends IWindowManager.Stub 
    public void setReplacingWindow(IBinder token, boolean animate) {

        synchronized (mWindowMap) {

            AppWindowToken appWindowToken = findAppWindowToken(token);

            if (appWindowToken == null) {

            if (appWindowToken == null || !appWindowToken.isVisible()) {

                Slog.w(TAG, "Attempted to set replacing window on non-existing app token " + token);

                return;

            }