Merge "Stop app switches only when home is the focused app" into main
diff --git a/services/core/java/com/android/server/wm/Transition.java b/services/core/java/com/android/server/wm/Transition.java
index bb80f69..2451ca8 100644
--- a/services/core/java/com/android/server/wm/Transition.java
+++ b/services/core/java/com/android/server/wm/Transition.java
@@ -1356,6 +1356,11 @@
mController.mAtm.setLastResumedActivityUncheckLocked(ar,
"transitionFinished");
}
+
+ // Prevent spurious background app switches.
+ if (ar.mDisplayContent.mFocusedApp == ar) {
+ mController.mAtm.stopAppSwitches();
+ }
}
continue;
}
@@ -1410,8 +1415,6 @@
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();