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

Commit 3dc83ae7 authored by Issei Suzuki's avatar Issei Suzuki Committed by Automerger Merge Worker
Browse files

Merge "Fix bubble shows empty content after rotating the device." into rvc-dev... 

Merge "Fix bubble shows empty content after rotating the device." into rvc-dev am: e8a51880 am: dacdf42b

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12070365

Change-Id: I6cfca494a37a8261b57b2b3ca4b92e7842b6617a
parents f4ad2854 dacdf42b

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

+5 −0
Original line number Diff line number Diff line
@@ -2058,7 +2058,12 @@ class ActivityStack extends Task { 
                    if (r.mLaunchTaskBehind) {

                        transit = TRANSIT_TASK_OPEN_BEHIND;

                    } else if (getDisplay().isSingleTaskInstance()) {

                        // If a new task is being launched in a single task display, we don't need

                        // to play normal animation, but need to trigger a callback when an app

                        // transition is actually handled. So ignore already prepared activity, and

                        // override it.

                        transit = TRANSIT_SHOW_SINGLE_TASK_DISPLAY;

                        keepCurTransition = false;

                    } else {

                        // If a new task is being launched, then mark the existing top activity as

                        // supporting picture-in-picture while pausing only if the starting activity