From b211358b1d3ea1ed56fae614371be21d1ec3834c Mon Sep 17 00:00:00 2001
From: Jing Ji <jji@google.com>
Date: Mon, 9 May 2022 14:38:59 -0700
Subject: [PATCH] Add the missing lock on the process start timeout handling

Bug: 231941936
Bug: 226712203
Test: Manual
Change-Id: Ia2c96fc5a73a7c946f01a308f57530c6a900946a
---
 services/core/java/com/android/server/am/ProcessList.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/services/core/java/com/android/server/am/ProcessList.java b/services/core/java/com/android/server/am/ProcessList.java
index fc73a59550018..92a8dcd2ba8f3 100644
--- a/services/core/java/com/android/server/am/ProcessList.java
+++ b/services/core/java/com/android/server/am/ProcessList.java
@@ -2028,8 +2028,10 @@ public final class ProcessList {
                     mService.mProcessList.handlePredecessorProcDied((ProcessRecord) msg.obj);
                     break;
                 case MSG_PROCESS_KILL_TIMEOUT:
-                    mService.handleProcessStartOrKillTimeoutLocked((ProcessRecord) msg.obj,
-                            /* isKillTimeout */ true);
+                    synchronized (mService) {
+                        mService.handleProcessStartOrKillTimeoutLocked((ProcessRecord) msg.obj,
+                                /* isKillTimeout */ true);
+                    }
                     break;
             }
         }