commit c66da9d606fa3091540bc4c51c2904cc949bf777
author Craig Mautner <cmautner@google.com> Mon Jul 07 15:29:50 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sun Jul 06 03:24:06 2014 +0000
tree 849222424dcc8de005b450a3495ad15eff7df45a
parent 5acdd0f67db9b5f41a89dfb5200f37d6f5f984ec
parent a4f1f8a239ae335ed15fda37f821d496e2dc6cfb

Merge "[ActivityManager] Prevent kill a restarted process again."

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

diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java
index 3e79eae..ae98070 100755
--- a/services/java/com/android/server/am/ActivityManagerService.java
+++ b/services/java/com/android/server/am/ActivityManagerService.java
@@ -12447,6 +12447,7 @@
         app.resetPackageList(mProcessStats);
         app.unlinkDeathRecipient();
         app.makeInactive(mProcessStats);
+        app.waitingToKill = null;
         app.forcingToForeground = null;
         app.foregroundServices = false;
         app.foregroundActivities = false;