Merge "Remove Persistent proccess without WTFing" into pi-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
4ea0a5a2df
@@ -3706,12 +3706,16 @@ public class ActivityManagerService extends IActivityManager.Stub
|
||||
int lrui = mLruProcesses.lastIndexOf(app);
|
||||
if (lrui >= 0) {
|
||||
if (!app.killed) {
|
||||
Slog.wtfStack(TAG, "Removing process that hasn't been killed: " + app);
|
||||
if (app.pid > 0) {
|
||||
killProcessQuiet(app.pid);
|
||||
killProcessGroup(app.uid, app.pid);
|
||||
if (app.persistent) {
|
||||
Slog.w(TAG, "Removing persistent process that hasn't been killed: " + app);
|
||||
} else {
|
||||
app.pendingStart = false;
|
||||
Slog.wtfStack(TAG, "Removing process that hasn't been killed: " + app);
|
||||
if (app.pid > 0) {
|
||||
killProcessQuiet(app.pid);
|
||||
killProcessGroup(app.uid, app.pid);
|
||||
} else {
|
||||
app.pendingStart = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (lrui <= mLruProcessActivityStart) {
|
||||
|
||||
Reference in New Issue
Block a user