diff options
| author | Jing Ji <jji@google.com> | 2019-10-25 12:03:30 -0700 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-06-10 00:36:53 +0000 |
| commit | 0a163302b0288cdc4d9ca5e04398386ef8e1ec6b (patch) | |
| tree | 7dfee72aa9eccf3a1b7615323d21fb4bb0c80555 | |
| parent | 4d467f1c7d7d355d0ac71a12ec8c2df07f756046 (diff) | |
| download | base-0a163302b0288cdc4d9ca5e04398386ef8e1ec6b.tar.gz | |
More fixes towards the race conditions in AMS
Bug: 142986887
Bug: 140108616
Test: Manual
Change-Id: I6e0bdc8c02bab54f6278096b3a3acadd97c064c6
Merged-In: I6e0bdc8c02bab54f6278096b3a3acadd97c064c6
(cherry picked from commit b2e84f0406139156442984943d8de7dd37d51368)
(cherry picked from commit b581128020acb378d0a941f022151d7e2883e19c)
| -rw-r--r-- | services/core/java/com/android/server/am/AppErrors.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/am/AppErrors.java b/services/core/java/com/android/server/am/AppErrors.java index bbd2d34e92a6..055ee1e2a0c0 100644 --- a/services/core/java/com/android/server/am/AppErrors.java +++ b/services/core/java/com/android/server/am/AppErrors.java @@ -383,7 +383,11 @@ class AppErrors { // and then the delayed summary kill will be a no-op. final ProcessRecord p = proc; mService.mHandler.postDelayed( - () -> killAppImmediateLocked(p, "forced", "killed for invalid state"), + () -> { + synchronized (mService) { + killAppImmediateLocked(p, "forced", "killed for invalid state"); + } + }, 5000L); } } |