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

Commit 86b06976 authored by Craig Mautner's avatar Craig Mautner Committed by Android Git Automerger
Browse files

am 45bf2815: Merge "Fix a couple of issues with mOpeningApps." into klp-dev 

* commit '45bf2815':
  Fix a couple of issues with mOpeningApps.
parents 22a97106 45bf2815

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

+1 −4
Original line number Original line Diff line number Diff line
@@ -4306,10 +4306,6 @@ public class WindowManagerService extends IWindowManager.Stub 
            // If we are preparing an app transition, then delay changing

            // If we are preparing an app transition, then delay changing

            // the visibility of this token until we execute that transition.

            // the visibility of this token until we execute that transition.

            if (okToDisplay() && mAppTransition.isTransitionSet()) {

            if (okToDisplay() && mAppTransition.isTransitionSet()) {

                // Already in requested state, don't do anything more.

                if (wtoken.hiddenRequested != visible) {

                    return;

                }

                wtoken.hiddenRequested = !visible;

                wtoken.hiddenRequested = !visible;





                if (!wtoken.startingDisplayed) {

                if (!wtoken.startingDisplayed) {
@@ -8526,6 +8522,7 @@ public class WindowManagerService extends IWindowManager.Stub 
                // We are transitioning from an activity with

                // We are transitioning from an activity with

                // a wallpaper to one without.

                // a wallpaper to one without.

                transit = AppTransition.TRANSIT_WALLPAPER_CLOSE;

                transit = AppTransition.TRANSIT_WALLPAPER_CLOSE;

                mAnimateWallpaperWithTarget = true;

                if (DEBUG_APP_TRANSITIONS) Slog.v(TAG,

                if (DEBUG_APP_TRANSITIONS) Slog.v(TAG,

                        "New transit away from wallpaper: " + transit);

                        "New transit away from wallpaper: " + transit);

            } else if (mWallpaperTarget != null && mWallpaperTarget.isVisibleLw()) {

            } else if (mWallpaperTarget != null && mWallpaperTarget.isVisibleLw()) {