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

Commit 92498090 authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Android (Google) Code Review
Browse files

Merge "Do not detach children of starting windows" into qt-r1-dev

parents f00f197d 35e049a6

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

+6 −0
Original line number Original line Diff line number Diff line
@@ -1493,6 +1493,12 @@ class WindowStateAnimator { 
    }

    }





    void detachChildren() {

    void detachChildren() {



        // Do not detach children of starting windows, as their lifecycle is well under control and

        // it may lead to issues in case we relaunch when we just added the starting window.

        if (mWin.mAttrs.type == TYPE_APPLICATION_STARTING) {

            return;

        }

        if (mSurfaceController != null) {

        if (mSurfaceController != null) {

            mSurfaceController.detachChildren();

            mSurfaceController.detachChildren();

        }

        }