Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve merge conflicts of 7641889 to lmp-mr1-dev

Browse Source 
Change-Id: Ie162907d7388d0e388ab39bcf2471d19e2ce7020
This commit is contained in:
Christopher Tate
2016-04-19 15:51:37 -07:00
parent 620a4ed031 76418899e6
commit cebcde3b5a
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -2483,7 +2483,7 @@ public final class ActivityManagerService extends ActivityManagerNative
if (!app.killed) { if (!app.killed) {
Slog.wtfStack(TAG, "Removing process that hasn't been killed: " + app); Slog.wtfStack(TAG, "Removing process that hasn't been killed: " + app);
Process.killProcessQuiet(app.pid); Process.killProcessQuiet(app.pid);
Process.killProcessGroup(app.info.uid, app.pid); Process.killProcessGroup(app.uid, app.pid);
} }
if (lrui <= mLruProcessActivityStart) { if (lrui <= mLruProcessActivityStart) {
mLruProcessActivityStart--; mLruProcessActivityStart--;
@@ -2818,7 +2818,7 @@ public final class ActivityManagerService extends ActivityManagerNative
// clean it up now. // clean it up now.
if (DEBUG_PROCESSES || DEBUG_CLEANUP) Slog.v(TAG, "App died: " + app); if (DEBUG_PROCESSES || DEBUG_CLEANUP) Slog.v(TAG, "App died: " + app);
checkTime(startTime, "startProcess: bad proc running, killing"); checkTime(startTime, "startProcess: bad proc running, killing");
Process.killProcessGroup(app.info.uid, app.pid); Process.killProcessGroup(app.uid, app.pid);
handleAppDiedLocked(app, true, true); handleAppDiedLocked(app, true, true);
checkTime(startTime, "startProcess: done killing old proc"); checkTime(startTime, "startProcess: done killing old proc");
} }
@@ -4700,7 +4700,7 @@ public final class ActivityManagerService extends ActivityManagerNative
if (!app.killed) { if (!app.killed) {
Process.killProcessQuiet(pid); Process.killProcessQuiet(pid);
Process.killProcessGroup(app.info.uid, pid); Process.killProcessGroup(app.uid, pid);
app.killed = true; app.killed = true;
} }

2
services/core/java/com/android/server/am/ProcessRecord.java
View File

@@ -527,7 +527,7 @@ final class ProcessRecord {
} }
EventLog.writeEvent(EventLogTags.AM_KILL, userId, pid, processName, setAdj, reason); EventLog.writeEvent(EventLogTags.AM_KILL, userId, pid, processName, setAdj, reason);
Process.killProcessQuiet(pid); Process.killProcessQuiet(pid);
Process.killProcessGroup(info.uid, pid); Process.killProcessGroup(uid, pid);
if (!persistent) { if (!persistent) {
killed = true; killed = true;
killedByAm = true; killedByAm = true;