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

Commit 1eda7e99 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: 32f4fcdf am: 557ea59c am: 8d5e34a4

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

Change-Id: I2f7f201b634ede3916e66f5ececdd9309c6a75ed
parents fc8d08b7 8d5e34a4

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

+5 −0
Original line number Diff line number Diff line
@@ -2029,7 +2029,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