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

Commit 7c18f217 authored by Bruno Martins's avatar Bruno Martins Committed by Zhao Wei Liew
Browse files

am: Fix mismerge 

 * The removal of this code was missed out
   during merge of tag 'android-6.0.1_r74'

Change-Id: I57dc035f79b7e20c09a21d5242c20370ad6d34ce
parent 996c5b93

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

+0 −9
Original line number Diff line number Diff line
@@ -3663,15 +3663,6 @@ public final class ActivityManagerService extends ActivityManagerNative 
                        true /*replacingPid*/);

            }

            synchronized (mPidsSelfLocked) {

                ProcessRecord oldApp;

                // If there is already an app occupying that pid that hasn't been cleaned up

                if ((oldApp = mPidsSelfLocked.get(startResult.pid)) != 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*/);

                }

                this.mPidsSelfLocked.put(startResult.pid, app);

                if (isActivityProcess) {

                    Message msg = mHandler.obtainMessage(PROC_START_TIMEOUT_MSG);