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

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

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

am: 5c53e1b8

Change-Id: Icd67597290378b8b62328cbfafa35fd0fc0497b6
parents d6a5f68f 5c53e1b8

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

+12 −9
Original line number Diff line number Diff line
@@ -3100,16 +3100,19 @@ public final class ActivityManagerService extends ActivityManagerNative 
            app.killed = false;

            app.killedByAm = false;

            checkTime(startTime, "startProcess: starting to update pids map");

            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);

                if (isActivityProcess) {

                    Message msg = mHandler.obtainMessage(PROC_START_TIMEOUT_MSG);