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

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

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

am: a437e7f3

Change-Id: I13fdcfc2ecca2e5e1d178d61ef8ec6990a0fc3af
parents 963ca6f9 a437e7f3

services/core/java/com/android/server/am/ActivityManagerService.java

+12 −9
Original line number Diff line number Diff line
@@ -2754,16 +2754,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;