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

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

resolve merge conflicts of 44e07e07 to mnc-dev am: 825b7134 am: 8c635e73 

am: 343600c3

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

Change-Id: I68dbf8f280672ec9770b6c57b9a17313f448e14a
parents 2dbac6ce 343600c3

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

+3 −3
Original line number Diff line number Diff line
@@ -2819,7 +2819,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);

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

                killProcessGroup(app.uid, app.pid);

            }

            if (lrui <= mLruProcessActivityStart) {

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

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

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

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

            killProcessGroup(app.uid, app.pid);

            handleAppDiedLocked(app, true, true);

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

        }
@@ -4710,7 +4710,7 @@ public final class ActivityManagerService extends ActivityManagerNative 
            if (!fromBinderDied) {

                Process.killProcessQuiet(pid);

            }

            killProcessGroup(app.info.uid, pid);

            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








@@ -554,7 +554,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;