| commit | c2cae50b832753dea612db575c6d97b8d94eceea | [log] [tgz] |
|---|---|---|
| author | Craig Mautner <cmautner@google.com> | Thu Dec 04 21:45:19 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Dec 04 21:45:21 2014 +0000 |
| tree | 651b80ff024b690fd9d797e4ca5334ad174c602b | |
| parent | 1289a3b2d3ae6ba67215d984c3302bfdcd69ae14 [diff] | |
| parent | 8920e1cabb56be6c46df40f5329aadbce3132fde [diff] |
Merge "Reset killedByAm flag at attachApplicationLocked" into lmp-mr1-dev
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 6823119..2c916da 100755 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -5878,6 +5878,7 @@ app.hasShownUi = false; app.debugging = false; app.cached = false; + app.killedByAm = false; mHandler.removeMessages(PROC_START_TIMEOUT_MSG, app);