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

Commit 595bbbd5 authored by Louis Chang's avatar Louis Chang Committed by Automerger Merge Worker
Browse files

Merge "Do not wait for Activity#onDestroy if the activity has no process" into... 

Merge "Do not wait for Activity#onDestroy if the activity has no process" into udc-qpr-dev am: 30539099

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23631200



Change-Id: Id04be5b46856e4fe985c1ebe1cb448867efd327f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b64f1667 30539099

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),