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

Commit 922af634 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 am: e8a51880 

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

Change-Id: Icd29b76288d4c06c80369d0b62fcf916355077a6
parents 03ece903 e8a51880

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

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

                    if (r.mLaunchTaskBehind) {

                        transit = TRANSIT_TASK_OPEN_BEHIND;

                        transit = TRANSIT_TASK_OPEN_BEHIND;

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

                    } 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;

                        transit = TRANSIT_SHOW_SINGLE_TASK_DISPLAY;

                        keepCurTransition = false;

                    } else {

                    } else {

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

                        // 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

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