| commit | c18982fded1ad7e16befdd01cf70f35414143b61 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Mon Apr 22 17:41:49 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Apr 22 17:41:49 2024 +0000 |
| tree | cc4e13afbb7ee549cb073fdeef27ec0f2fef3a8e | |
| parent | 5c28641be8641e9e695da4ee4dc1f2c49fd172fe [diff] | |
| parent | d5ab603f8209c44bd85ac160ddca70983752446c [diff] |
Merge "Fix empty anr file when process exit early" into main am: d5ab603f82 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3032186 Change-Id: Ia4b6cf7fe060ab9586746321b1708d22cbc3c567 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index d35892e..28d840b 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -13496,6 +13496,8 @@ // Goodbye! removePidLocked(pid, app); mHandler.removeMessages(PROC_START_TIMEOUT_MSG, app); + mHandler.removeMessages(BIND_APPLICATION_TIMEOUT_SOFT_MSG, app); + mHandler.removeMessages(BIND_APPLICATION_TIMEOUT_HARD_MSG, app); mBatteryStatsService.noteProcessFinish(app.processName, app.info.uid); if (app.isolated) { mBatteryStatsService.removeIsolatedUid(app.uid, app.info.uid);