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

Commit 0a7e51d5 authored by Michael Wachenschwanz's avatar Michael Wachenschwanz Committed by android-build-merger
Browse files

Merge "Remove Persistent proccess without WTFing" into pi-dev 

am: 4ea0a5a2

Change-Id: I5438e638103171f33cfaf7d4d8c7538d93d61dd2
parents 53203737 4ea0a5a2

services/core/java/com/android/server/am/ActivityManagerService.java

+9 −5
Original line number Diff line number Diff line
@@ -3706,6 +3706,9 @@ public class ActivityManagerService extends IActivityManager.Stub 
        int lrui = mLruProcesses.lastIndexOf(app);

        if (lrui >= 0) {

            if (!app.killed) {

                if (app.persistent) {

                    Slog.w(TAG, "Removing persistent process that hasn't been killed: " + app);

                } else {

                    Slog.wtfStack(TAG, "Removing process that hasn't been killed: " + app);

                    if (app.pid > 0) {

                        killProcessQuiet(app.pid);
@@ -3714,6 +3717,7 @@ public class ActivityManagerService extends IActivityManager.Stub 
                        app.pendingStart = false;

                    }

                }

            }

            if (lrui <= mLruProcessActivityStart) {

                mLruProcessActivityStart--;

            }