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

Commit 5e380f09 authored by Christopher Tate's avatar Christopher Tate Committed by android-build-merger
Browse files

resolve merge conflicts of 76418899 to lmp-mr1-dev 

am: cebcde3b

* commit 'cebcde3b':
  Kill the real/isolated uid group, not the ApplicationInfo uid

Change-Id: I6e3c41c59dfe4105780ad7d6d20f9096aabd575a
parents be58fe03 cebcde3b

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

+3 −3
Original line number Diff line number Diff line
@@ -2483,7 +2483,7 @@ public final class ActivityManagerService extends ActivityManagerNative 
            if (!app.killed) {

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

                Process.killProcessQuiet(app.pid);

                Process.killProcessGroup(app.info.uid, app.pid);

                Process.killProcessGroup(app.uid, app.pid);

            }

            if (lrui <= mLruProcessActivityStart) {

                mLruProcessActivityStart--;
@@ -2818,7 +2818,7 @@ public final class ActivityManagerService extends ActivityManagerNative 
            // clean it up now.

            if (DEBUG_PROCESSES || DEBUG_CLEANUP) Slog.v(TAG, "App died: " + app);

            checkTime(startTime, "startProcess: bad proc running, killing");

            Process.killProcessGroup(app.info.uid, app.pid);

            Process.killProcessGroup(app.uid, app.pid);

            handleAppDiedLocked(app, true, true);

            checkTime(startTime, "startProcess: done killing old proc");

        }
@@ -4700,7 +4700,7 @@ public final class ActivityManagerService extends ActivityManagerNative 














        if (!app.killed) {















            Process.killProcessQuiet(pid);













            Process.killProcessGroup(app.info.uid, pid);













            Process.killProcessGroup(app.uid, pid);















            app.killed = true;















        }















































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



+1
−1






























Original line number
Diff line number
Diff line








@@ -527,7 +527,7 @@ final class ProcessRecord {













            }















            EventLog.writeEvent(EventLogTags.AM_KILL, userId, pid, processName, setAdj, reason);















            Process.killProcessQuiet(pid);













            Process.killProcessGroup(info.uid, pid);













            Process.killProcessGroup(uid, pid);















            if (!persistent) {















                killed = true;















                killedByAm = true;