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

Commit 8402a174 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Fix deadlock in AcitivityManagerService. am: 67e05b4d am: 44c9e2f4" into nyc-mr1-dev

parents 4bbca649 b4ecfb9d

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

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