am 11c67c92: am 7db48ed0: Merge "Reset killedByAm flag at attachApplicationLocked"

* commit '11c67c92de3522a50b9994eb83e34c152902ad18': Reset killedByAm flag at attachApplicationLocked
2014-12-01 05:26:37 +00:00
parent 0124980e9f 11c67c92de
commit 5a6c196259
1 changed files with 1 additions and 0 deletions
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -5843,6 +5843,7 @@ public final class ActivityManagerService extends ActivityManagerNative
        app.hasShownUi = false;
        app.debugging = false;
        app.cached = false;
+        app.killedByAm = false;

        mHandler.removeMessages(PROC_START_TIMEOUT_MSG, app);