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

Commit 2e8d7cc7 authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by Android (Google) Code Review
Browse files

Merge "Preventing start back navigation before new activity window created." into main

parents c3c75854 94562ef1

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

+3 −1
Original line number Diff line number Diff line
@@ -190,7 +190,9 @@ class BackNavigationController { 
            currentActivity = window.mActivityRecord;

            currentTask = window.getTask();

            if ((currentTask != null && !currentTask.isVisibleRequested())

                    || (currentActivity != null && !currentActivity.isVisibleRequested())) {

                    || (currentActivity != null && !currentActivity.isVisibleRequested())

                    || (currentActivity != null && currentTask != null

                            && currentTask.getTopNonFinishingActivity() != currentActivity)) {

                // Closing transition is happening on focus window and should be update soon,

                // don't drive back navigation with it.

                ProtoLog.d(WM_DEBUG_BACK_PREVIEW, "Focus window is closing.");