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

DO NOT MERGE: Fix deadlock in AcitivityManagerService. am: dce4be63bb

Browse Source 
am: a437e7f3f1

Change-Id: I13fdcfc2ecca2e5e1d178d61ef8ec6990a0fc3af
This commit is contained in:
Sudheer Shanka
2016-09-19 21:02:53 +00:00
committed by android-build-merger
parent 963ca6f947 a437e7f3f1
commit c1b2e6db98
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2754,16 +2754,19 @@ public final class ActivityManagerService extends ActivityManagerNative
app.setPid(startResult.pid); app.setPid(startResult.pid);
app.usingWrapper = startResult.usingWrapper; app.usingWrapper = startResult.usingWrapper;
app.removed = false; app.removed = false;
synchronized (mPidsSelfLocked) {
ProcessRecord oldApp; ProcessRecord oldApp;
synchronized (mPidsSelfLocked) {
oldApp = mPidsSelfLocked.get(startResult.pid);
}
// If there is already an app occupying that pid that hasn't been cleaned up // If there is already an app occupying that pid that hasn't been cleaned up
if ((oldApp = mPidsSelfLocked.get(startResult.pid)) != null && !app.isolated) { if (oldApp != null && !app.isolated) {
// Clean up anything relating to this pid first // Clean up anything relating to this pid first
Slog.w(TAG, "Reusing pid " + startResult.pid Slog.w(TAG, "Reusing pid " + startResult.pid
+ " while app is still mapped to it"); + " while app is still mapped to it");
cleanUpApplicationRecordLocked(oldApp, false, false, -1, cleanUpApplicationRecordLocked(oldApp, false, false, -1,
true /*replacingPid*/); true /*replacingPid*/);
} }
synchronized (mPidsSelfLocked) {
this.mPidsSelfLocked.put(startResult.pid, app); this.mPidsSelfLocked.put(startResult.pid, app);
Message msg = mHandler.obtainMessage(PROC_START_TIMEOUT_MSG); Message msg = mHandler.obtainMessage(PROC_START_TIMEOUT_MSG);
msg.obj = app; msg.obj = app;