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

Commit a437e7f3 authored by Sudheer Shanka's avatar Sudheer Shanka Committed by android-build-merger
Browse files

DO NOT MERGE: Fix deadlock in AcitivityManagerService.

am: dce4be63

Change-Id: Ia1db0d226d84ed07da6712f554327b49c9fe59c0
parents 7c08c4d5 dce4be63
Loading
Loading
Loading
Loading
+12 −9
Original line number Diff line number Diff line
@@ -2818,16 +2818,19 @@ public final class ActivityManagerService extends ActivityManagerNative
            app.setPid(startResult.pid);
            app.usingWrapper = startResult.usingWrapper;
            app.removed = false;
            synchronized (mPidsSelfLocked) {
            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 ((oldApp = mPidsSelfLocked.get(startResult.pid)) != null && !app.isolated) {
            if (oldApp != null && !app.isolated) {
                // Clean up anything relating to this pid first
                Slog.w(TAG, "Reusing pid " + startResult.pid
                        + " while app is still mapped to it");
                cleanUpApplicationRecordLocked(oldApp, false, false, -1,
                        true /*replacingPid*/);
            }
            synchronized (mPidsSelfLocked) {
                this.mPidsSelfLocked.put(startResult.pid, app);
                Message msg = mHandler.obtainMessage(PROC_START_TIMEOUT_MSG);
                msg.obj = app;