commit 0a9927025041a6dde3f3878bdd868a69ab1b3266
author Craig Mautner <cmautner@google.com> Mon Jul 07 15:41:55 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Jul 07 15:41:55 2014 +0000
tree 3496883eff825dee13b75d35191fbec6494d934b
parent 53cc7d7998a9a656fe89ec8eba40ad479bded274
parent 09c1af5d5c43f716fb4093eae6cf5442e7bb88d1

am 09c1af5d: am c66da9d6: Merge "[ActivityManager] Prevent kill a restarted process again."

* commit '09c1af5d5c43f716fb4093eae6cf5442e7bb88d1':
  [ActivityManager] Prevent kill a restarted process again.

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

diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index 8013b4a..762f262 100755
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -12337,6 +12337,7 @@
         app.resetPackageList(mProcessStats);
         app.unlinkDeathRecipient();
         app.makeInactive(mProcessStats);
+        app.waitingToKill = null;
         app.forcingToForeground = null;
         app.foregroundServices = false;
         app.foregroundActivities = false;