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

Commit 1f95fa58 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix packageNotInstalledSecureFrp for device with nested tasks" into udc-qpr-dev

parents eda2ac9f b35469cc

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

+1 −1
Original line number Diff line number Diff line
@@ -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;