Snap for 8316345 from 993b7d15bacdad04c574b334160a7ce8676511a9 to sc-qpr3-releaseandroid-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r11android-12.1.0_r10android12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-release

Change-Id: I0ae9c7f085cf10cf2ba8880cdac2b56cc5a9aa3e

1 files changed, 7 insertions, 2 deletions

diff --git a/src/com/android/internal/car/CarServiceHelperService.java b/src/com/android/internal/car/CarServiceHelperService.java
index 20e53b8..84e1e5c 100644
--- a/src/com/android/internal/car/CarServiceHelperService.java
+++ b/src/com/android/internal/car/CarServiceHelperService.java
@@ -448,12 +448,17 @@ public class CarServiceHelperService extends SystemService
             Slogf.i(TAG, "**CarService connected**");
         }
 
-        sendSetSystemServerConnectionsCall();
-
         mHandler.removeMessages(WHAT_SERVICE_UNRESPONSIVE);
         mHandler.sendMessageDelayed(
                 obtainMessage(CarServiceHelperService::handleCarServiceUnresponsive, this)
                         .setWhat(WHAT_SERVICE_UNRESPONSIVE), CAR_SERVICE_BINDER_CALL_TIMEOUT);
+
+        // Post WHAT_SERVICE_UNRESPONSIVE message before setting system server connection
+        // because CarService may respond before the sendSetSystemServerConnectionsCall call
+        // returns and try to remove WHAT_SERVICE_UNRESPONSIVE message from the handler.
+        // Thus, posting this message after setting system server connection may result in a race
+        // condition where the message is never removed from the handler.
+        sendSetSystemServerConnectionsCall();
     }
 
     private TimingsTraceAndSlog newTimingsTraceAndSlog() {