Merge "More fixes towards the race conditions in AMS" into oc-mr1-dev

2020-06-03 22:09:12 +00:00
parent fab2a65c3a 9450069de9
commit 239ab1c9d6
1 changed files with 5 additions and 1 deletions
--- a/services/core/java/com/android/server/am/AppErrors.java
+++ b/services/core/java/com/android/server/am/AppErrors.java
@@ -312,7 +312,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);
        }
    }