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

Commit ae44d64d authored by Louis Chang's avatar Louis Chang
Browse files

Do not wait for Activity#onDestroy if the activity has no process 

The activity process was killed by force stopping the app package in
#teardown, but the activity was deferred to be removed from wm hierarchy
due to in transition. Before the transition completed, a kill-task-process
message was scheduled because the app task was requested to be removed
by the test. The app process that started afterward could then be
killed once the timeout occurs.

Bug: 286349050
Test: atest DisplayTests
Change-Id: I8c70c25342fd373c812f535bd2bc47da4038af04
parent 5f433062

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

+1 −1
Original line number Diff line number Diff line
@@ -1891,7 +1891,7 @@ public class ActivityTaskSupervisor implements RecentTasks.Callbacks { 
        // DestroyActivityItem may be called first.

        final ActivityRecord top = task.getTopMostActivity();

        if (top != null && top.finishing && !top.mAppStopped && top.lastVisibleTime > 0

                && !task.mKillProcessesOnDestroyed) {

                && !task.mKillProcessesOnDestroyed && top.hasProcess()) {

            task.mKillProcessesOnDestroyed = true;

            mHandler.sendMessageDelayed(

                    mHandler.obtainMessage(KILL_TASK_PROCESSES_TIMEOUT_MSG, task),