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

Commit 7c579cd0 authored by Jorim Jaggi's avatar Jorim Jaggi
Browse files

Fix bubble transition hanging issues 

- Update display info before changing visibilities such that we
can always start the transition (okToAnimate returns true)
- Make sure to executeAppTransition

Test: Open Bubble above app that has posted bubble
Bug: 151103701
Change-Id: I62e89a38d7dc061cb45b98d2c44cbc4ee009f714
parent 8df5b601

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

+4 −4
Original line number Diff line number Diff line
@@ -5628,6 +5628,10 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo 
    }



    void onDisplayChanged() {

        mDisplay.getRealSize(mTmpDisplaySize);

        setBounds(0, 0, mTmpDisplaySize.x, mTmpDisplaySize.y);

        updateDisplayInfo();



        // The window policy is responsible for stopping activities on the default display.

        final int displayId = mDisplay.getDisplayId();

        if (displayId != DEFAULT_DISPLAY) {
@@ -5639,10 +5643,6 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo 
                mOffToken = null;

            }

        }



        mDisplay.getRealSize(mTmpDisplaySize);

        setBounds(0, 0, mTmpDisplaySize.x, mTmpDisplaySize.y);

        updateDisplayInfo();

        mWmService.requestTraversal();

    }

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

+3 −0
Original line number Diff line number Diff line
@@ -2289,6 +2289,9 @@ class RootWindowContainer extends WindowContainer<DisplayContent> 
                                TRANSIT_SHOW_SINGLE_TASK_DISPLAY, false);

                    }

                    stack.awakeFromSleepingLocked();

                    if (display.isSingleTaskInstance()) {

                        display.executeAppTransition();

                    }

                    if (stack.isFocusedStackOnDisplay()

                            && !mStackSupervisor.getKeyguardController()

                            .isKeyguardOrAodShowing(display.mDisplayId)) {