commit 483134783a183d21adbfed46e63f26aa3ea2ba70
author Jing Ji <jji@google.com> Fri Oct 25 12:03:30 2019 -0700
committer Anis Assi <anisassi@google.com> Thu Jun 04 11:25:48 2020 -0700
tree b06523276c7c1136eb0273415bfeadf03d225e5a
parent 23328ab4ca9fb77a3757c4acaf55363e52420e94

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 9450069de999f21156943dba175f0b29dc91b56e)

services/core/java/com/android/server/am/AppErrors.java

diff --git a/services/core/java/com/android/server/am/AppErrors.java b/services/core/java/com/android/server/am/AppErrors.java
index a7954bb..107372d 100644
--- a/services/core/java/com/android/server/am/AppErrors.java
+++ b/services/core/java/com/android/server/am/AppErrors.java
@@ -312,7 +312,11 @@
             // 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);
         }
     }