commit 65f6d21763d0c4f0919c7a671591ea0d84e9a1aa
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Oct 21 21:19:15 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Oct 21 21:19:15 2019 +0000
tree 23dd775421b927df19013f728b113d69aac9b6ee
parent 92d3289106b69a409eb98fa6dc8a5248b1c14edf
parent 20cf735ac84018bdb2c4ad7e49c68aed2898e663

Merge "Crash car service when vhal crashes" into qt-qpr1-dev

service/src/com/android/car/CarService.java

diff --git a/service/src/com/android/car/CarService.java b/service/src/com/android/car/CarService.java
index 509ecdd..fdc4995 100644
--- a/service/src/com/android/car/CarService.java
+++ b/service/src/com/android/car/CarService.java
@@ -25,6 +25,7 @@
 import android.os.Build;
 import android.os.IBinder;
 import android.os.IHwBinder.DeathRecipient;
+import android.os.Process;
 import android.os.RemoteException;
 import android.os.ServiceManager;
 import android.os.SystemClock;
@@ -41,6 +42,8 @@
 
 public class CarService extends Service {
 
+    private static final boolean RESTART_CAR_SERVICE_WHEN_VHAL_CRASH = true;
+
     private static final long WAIT_FOR_VEHICLE_HAL_TIMEOUT_MS = 10_000;
 
     private static final boolean IS_USER_BUILD = "user".equals(Build.TYPE);
@@ -178,7 +181,13 @@
 
         @Override
         public void serviceDied(long cookie) {
-            Log.w(CarLog.TAG_SERVICE, "Vehicle HAL died.");
+            if (RESTART_CAR_SERVICE_WHEN_VHAL_CRASH) {
+                Log.wtf(CarLog.TAG_SERVICE, "***Vehicle HAL died. Car service will restart***");
+                Process.killProcess(Process.myPid());
+                return;
+            }
+
+            Log.wtf(CarLog.TAG_SERVICE, "***Vehicle HAL died.***");
 
             try {
                 mVehicle.unlinkToDeath(this);