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

Commit 38b2478f authored by Craig Mautner's avatar Craig Mautner
Browse files

Clear startingDisplayed flag when removing window. 

The flag indicating that the Starting window is displayed was not
being cleared when the Starting window was removed. That caused the
goodToGo indication to falsely indicate that all windows were drawn
when in fact the destination activity had not yet been drawn. This
caused the animation to begin when it was still black behind the old
animation.

This fixes bug 6764727.

Change-Id: Iacef73b0335b9bde2cdc8d0b072034222cd728e8
parent 73d90e79

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

+6 −0
Original line number Diff line number Diff line
@@ -2291,6 +2291,8 @@ public class WindowManagerService extends IWindowManager.Stub 
            if (attrs.type == TYPE_APPLICATION_STARTING &&

                    token.appWindowToken != null) {

                token.appWindowToken.startingWindow = win;

                if (DEBUG_STARTING_WINDOW) Slog.v (TAG, "addWindow: " + token.appWindowToken

                        + " startingWindow=" + win);

            }



            boolean imMayMove = true;
@@ -2514,10 +2516,12 @@ public class WindowManagerService extends IWindowManager.Stub 


        if (atoken != null) {

            if (atoken.startingWindow == win) {

                if (DEBUG_STARTING_WINDOW) Slog.v(TAG, "Nulling startingWindow " + win);

                atoken.startingWindow = null;

            } else if (atoken.allAppWindows.size() == 0 && atoken.startingData != null) {

                // If this is the last window and we had requested a starting

                // transition window, well there is no point now.

                if (DEBUG_STARTING_WINDOW) Slog.v(TAG, "Nulling last startingWindow");

                atoken.startingData = null;

            } else if (atoken.allAppWindows.size() == 1 && atoken.startingView != null) {

                // If this is the last window except for a starting transition
@@ -7038,6 +7042,7 @@ public class WindowManagerService extends IWindowManager.Stub 
                            wtoken.startingData = null;

                            wtoken.startingView = null;

                            wtoken.startingWindow = null;

                            wtoken.startingDisplayed = false;

                        }

                    }

                    if (view != null) {
@@ -7074,6 +7079,7 @@ public class WindowManagerService extends IWindowManager.Stub 
                            wtoken.startingData = null;

                            wtoken.startingView = null;

                            wtoken.startingWindow = null;

                            wtoken.startingDisplayed = false;

                        }



                        try {