Merge "Finishing the visible requested activity vs. destroying it" into tm-qpr-dev

2022-12-17 08:32:09 +00:00
parent 41f50d35c2 2d8b0451c9
commit ff91f4ef55
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/wm/WindowOrganizerController.java
+++ b/services/core/java/com/android/server/wm/WindowOrganizerController.java
@@ -1062,7 +1062,7 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub
                if (activity == null || activity.finishing) {
                    break;
                }
-                if (activity.isVisible()) {
+                if (activity.isVisible() || activity.isVisibleRequested()) {
                    // Prevent the transition from being executed too early if the activity is
                    // visible.
                    activity.finishIfPossible("finish-activity-op", false /* oomAdj */);