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

* commit '11c67c92de3522a50b9994eb83e34c152902ad18':
  Reset killedByAm flag at attachApplicationLocked
This commit is contained in:
Craig Mautner
2014-12-01 05:26:37 +00:00
committed by Android Git Automerger

View File

@@ -5843,6 +5843,7 @@ public final class ActivityManagerService extends ActivityManagerNative
app.hasShownUi = false; app.hasShownUi = false;
app.debugging = false; app.debugging = false;
app.cached = false; app.cached = false;
app.killedByAm = false;
mHandler.removeMessages(PROC_START_TIMEOUT_MSG, app); mHandler.removeMessages(PROC_START_TIMEOUT_MSG, app);