summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruno Martins <bgcngm@gmail.com>2016-11-10 00:03:21 +0000
committerZhao Wei Liew <zhaoweiliew@gmail.com>2016-11-09 19:28:17 -0700
commit7c18f217d9520bfa94269fa81f3fe3e81edb6b6c (patch)
tree2bccbf377c4896927c869d64bb0756c32f4a5de1
parent996c5b93d6e8d5f3e5d5248e08a32f401ebfcb28 (diff)
downloadframeworks_base-7c18f217d9520bfa94269fa81f3fe3e81edb6b6c.zip
frameworks_base-7c18f217d9520bfa94269fa81f3fe3e81edb6b6c.tar.gz
frameworks_base-7c18f217d9520bfa94269fa81f3fe3e81edb6b6c.tar.bz2
am: Fix mismerge
* The removal of this code was missed out during merge of tag 'android-6.0.1_r74' Change-Id: I57dc035f79b7e20c09a21d5242c20370ad6d34ce
-rwxr-xr-xservices/core/java/com/android/server/am/ActivityManagerService.java9
1 files changed, 0 insertions, 9 deletions
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index 4f297e8..30f35af 100755
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -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);