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

Commit b74f46f0 authored by Chong Zhang's avatar Chong Zhang Committed by android-build-merger
Browse files

Merge "Fix dead surface/window left on screen" into nyc-dev am: 289395b1 

am: 31e3b5c0

* commit '31e3b5c0':
  Fix dead surface/window left on screen

Change-Id: I46664a5f9ca48557fab650385409e445267b109d
parents fca91266 31e3b5c0

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

+0 −1
Original line number Diff line number Diff line
@@ -4258,7 +4258,6 @@ public class WindowManagerService extends IWindowManager.Stub 
                                    WindowManagerPolicy.TRANSIT_EXIT);

                        }

                    }

                    win.mAnimatingExit = true;

                    changed = true;

                    win.setDisplayLayoutNeeded();

                }

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

+3 −0
Original line number Diff line number Diff line
@@ -100,6 +100,8 @@ class WindowSurfaceController { 
    void hideInTransaction(String reason) {

        if (SHOW_TRANSACTIONS) logSurface("HIDE ( " + reason + " )", null);

        mHiddenForOtherReasons = true;



        mAnimator.destroyPreservedSurfaceLocked();

        updateVisibility();

    }
@@ -180,6 +182,7 @@ class WindowSurfaceController { 
                updateVisibility();

            } else {

                mHiddenForCrop = true;

                mAnimator.destroyPreservedSurfaceLocked();

                updateVisibility();

            }

        } catch (RuntimeException e) {