From 5f647cd3f2eb383b764659fc9000c85be2ee7509 Mon Sep 17 00:00:00 2001 From: Jing Ji Date: Fri, 25 Oct 2019 12:03:30 -0700 Subject: 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) --- services/core/java/com/android/server/am/AppErrors.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/am/AppErrors.java b/services/core/java/com/android/server/am/AppErrors.java index 6a29c75b702a..8095020ce4ce 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); } } -- cgit v1.2.3-59-g8ed1b