summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2023-08-22 01:25:42 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2023-08-22 01:25:42 +0000
commit1f95fa5871de55f0608e3f6c662481c6030770c8 (patch)
treede02cb246fce0834fead1cc7c6d77198a09650a6
parenteda2ac9f0e1d69fb3f4cad50e586f75c1b4c3486 (diff)
parentb35469ccff1e7b7f4b603b6179261712fc7cc718 (diff)
Merge "Fix packageNotInstalledSecureFrp for device with nested tasks" into udc-qpr-dev
-rw-r--r--services/core/java/com/android/server/wm/RootWindowContainer.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/RootWindowContainer.java b/services/core/java/com/android/server/wm/RootWindowContainer.java
index 05f95f813e55..d4fdc1290649 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 @@ class RootWindowContainer extends WindowContainer<DisplayContent>
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;