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

Commit 024e96d6 authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by Automerger Merge Worker
Browse files

Merge "Skip transfer starting window from above if current activity has... 

Merge "Skip transfer starting window from above if current activity has drawn." into udc-dev am: e765320b am: df4cee5b

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



Change-Id: I7ad2012fd467ea6ed3e7009be83b0670e2e1516f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 68ecb103 df4cee5b

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

+7 −0
Original line number Diff line number Diff line
@@ -4564,6 +4564,13 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
     * immediately finishes after, so we have to transfer T to M.

     */

    void transferStartingWindowFromHiddenAboveTokenIfNeeded() {

        final WindowState mainWin = findMainWindow(false);

        if (mainWin != null && mainWin.mWinAnimator.getShown()) {

            // This activity already has a visible window, so doesn't need to transfer the starting

            // window from above activity to here. The starting window will be removed with above

            // activity.

            return;

        }

        task.forAllActivities(fromActivity -> {

            if (fromActivity == this) return true;

            return !fromActivity.isVisibleRequested() && transferStartingWindow(fromActivity);