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

Commit f83a753c authored by Louis Chang's avatar Louis Chang Committed by Android (Google) Code Review
Browse files

Merge "Stop app switches only when home is the focused app" into main

parents 44d0b5dd 3740c2e7

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

+5 −2
Original line number Diff line number Diff line
@@ -1356,6 +1356,11 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener { 
                        mController.mAtm.setLastResumedActivityUncheckLocked(ar,

                                "transitionFinished");

                    }



                    // Prevent spurious background app switches.

                    if (ar.mDisplayContent.mFocusedApp == ar) {

                        mController.mAtm.stopAppSwitches();

                    }

                }

                continue;

            }
@@ -1410,8 +1415,6 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener { 
            if (enterAutoPip) {

                mController.mAtm.getTaskChangeNotificationController().notifyTaskStackChanged();

            }

            // Prevent spurious background app switches.

            mController.mAtm.stopAppSwitches();

            // The end of transient launch may not reorder task, so make sure to compute the latest

            // task rank according to the current visibility.

            mController.mAtm.mRootWindowContainer.rankTaskLayers();