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

Commit 389d8a3d authored by Wale Ogunwale's avatar Wale Ogunwale Committed by android-build-merger
Browse files

Merge "Don\'t keep dead window with borrowed app token visible" into nyc-dev... 

Merge "Don\'t keep dead window with borrowed app token visible" into nyc-dev am: ccca9fe2 am: 29ec4ee8
am: ef9ccf52

* commit 'ef9ccf52':
  Don't keep dead window with borrowed app token visible

Change-Id: I4505ed9e907ac2873bd003bd2f9e2e1068742584
parents 7c06bc78 ef9ccf52

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

+6 −0
Original line number Original line Diff line number Diff line
@@ -1781,6 +1781,12 @@ final class WindowState implements WindowManagerPolicy.WindowState { 
            return false;

            return false;

        }

        }





        if (mAttrs.token != mClient.asBinder()) {

            // The window was add by a client using another client's app token. We don't want to

            // keep the dead window around for this case since this is meant for 'real' apps.

            return false;

        }



        if (mAttrs.type == TYPE_APPLICATION_STARTING) {

        if (mAttrs.type == TYPE_APPLICATION_STARTING) {

            // We don't keep starting windows since they were added by the window manager before

            // We don't keep starting windows since they were added by the window manager before

            // the app even launched.

            // the app even launched.