commit b35469ccff1e7b7f4b603b6179261712fc7cc718
author Calvin Huang <calhuang@google.com> Wed Aug 16 04:58:25 2023 +0000
committer Calvin Huang <calhuang@google.com> Wed Aug 16 04:58:26 2023 +0000
tree 107f84b3cf41fc62fce0cad4e66d11a66e82c0c0
parent 657e69c9bd4a9cd928565bf2e7e70d0356661983

Fix packageNotInstalledSecureFrp for device with nested tasks

Prevent finishing the top activities of the same leaf task twice.

Test: android.packageinstaller.install.cts.IntentTest#packageNotInstalledSecureFrp
Fix: 292176003
Change-Id: I2ba217862d7c6721c7d3c2625f697f9cc428c1ca

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

diff --git a/services/core/java/com/android/server/wm/RootWindowContainer.java b/services/core/java/com/android/server/wm/RootWindowContainer.java
index 05f95f81..d4fdc12 100644
--- a/services/core/java/com/android/server/wm/RootWindowContainer.java
+++ b/services/core/java/com/android/server/wm/RootWindowContainer.java
@@ -2264,7 +2264,7 @@
     int finishTopCrashedActivities(WindowProcessController app, String reason) {
         Task focusedRootTask = getTopDisplayFocusedRootTask();
         final Task[] finishedTask = new Task[1];
-        forAllTasks(rootTask -> {
+        forAllRootTasks(rootTask -> {
             final Task t = rootTask.finishTopCrashedActivityLocked(app, reason);
             if (rootTask == focusedRootTask || finishedTask[0] == null) {
                 finishedTask[0] = t;