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

Fix race condition bug related to freezing apps.

Browse Source 
am: 41d2be0f0f

Change-Id: I012093b52efda2cdffa47143c40e2708007158f5
This commit is contained in:
Jeff Sharkey
2016-12-09 17:28:43 +00:00
committed by android-build-merger
parent 1e40ddc47a 41d2be0f0f
commit 453efdc065
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6278,8 +6278,19 @@ public final class ActivityManagerService extends ActivityManagerNative
} }
private final ProcessRecord removeProcessNameLocked(final String name, final int uid) { private final ProcessRecord removeProcessNameLocked(final String name, final int uid) {
ProcessRecord old = mProcessNames.remove(name, uid); return removeProcessNameLocked(name, uid, null);
if (old != null) { }
private final ProcessRecord removeProcessNameLocked(final String name, final int uid,
final ProcessRecord expecting) {
ProcessRecord old = mProcessNames.get(name, uid);
// Only actually remove when the currently recorded value matches the
// record that we expected; if it doesn't match then we raced with a
// newly created process and we don't want to destroy the new one.
if ((expecting == null) || (old == expecting)) {
mProcessNames.remove(name, uid);
}
if (old != null && old.uidRecord != null) {
old.uidRecord.numProcs--; old.uidRecord.numProcs--;
if (old.uidRecord.numProcs == 0) { if (old.uidRecord.numProcs == 0) {
// No more processes using this uid, tell clients it is gone. // No more processes using this uid, tell clients it is gone.
@@ -17043,7 +17054,7 @@ public final class ActivityManagerService extends ActivityManagerNative
if (DEBUG_PROCESSES || DEBUG_CLEANUP) Slog.v(TAG_CLEANUP, if (DEBUG_PROCESSES || DEBUG_CLEANUP) Slog.v(TAG_CLEANUP,
"Removing non-persistent process during cleanup: " + app); "Removing non-persistent process during cleanup: " + app);
if (!replacingPid) { if (!replacingPid) {
removeProcessNameLocked(app.processName, app.uid); removeProcessNameLocked(app.processName, app.uid, app);
} }
if (mHeavyWeightProcess == app) { if (mHeavyWeightProcess == app) {
mHandler.sendMessage(mHandler.obtainMessage(CANCEL_HEAVY_NOTIFICATION_MSG, mHandler.sendMessage(mHandler.obtainMessage(CANCEL_HEAVY_NOTIFICATION_MSG,