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

* commit '5a6c1962590979d0722da0547a6ba3ae1a98dd04': Reset killedByAm flag at attachApplicationLocked
2014-12-01 05:33:27 +00:00
parent 3395e39c5d 5a6c196259
commit a675838a6c
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);