Merge "Fix CarWatchdogService.CarWatchdogClientCallback" into rvc-dev
diff --git a/car-lib/api/system-current.txt b/car-lib/api/system-current.txt
index f34ba4e..3858e9b 100644
--- a/car-lib/api/system-current.txt
+++ b/car-lib/api/system-current.txt
@@ -1402,7 +1402,7 @@
field public static final int TIMEOUT_NORMAL = 2; // 0x2
}
- public abstract class CarWatchdogManager.CarWatchdogClientCallback {
+ public abstract static class CarWatchdogManager.CarWatchdogClientCallback {
ctor public CarWatchdogManager.CarWatchdogClientCallback();
method public boolean onCheckHealthStatus(int, int);
method public void onPrepareProcessTermination();
diff --git a/car-lib/src/android/car/watchdog/CarWatchdogManager.java b/car-lib/src/android/car/watchdog/CarWatchdogManager.java
index 6f85982..81ba3e1 100644
--- a/car-lib/src/android/car/watchdog/CarWatchdogManager.java
+++ b/car-lib/src/android/car/watchdog/CarWatchdogManager.java
@@ -83,7 +83,7 @@
* <p>Before car watchdog server kills the client, it calls onPrepareProcessKill to allow them
* to prepare the termination. They will be killed in 1 second.
*/
- public abstract class CarWatchdogClientCallback {
+ public abstract static class CarWatchdogClientCallback {
/**
* Car watchdog server pings the client to check if it is alive.
*
diff --git a/service/src/com/android/car/CarFeatureController.java b/service/src/com/android/car/CarFeatureController.java
index 5bbeb01..0418967 100644
--- a/service/src/com/android/car/CarFeatureController.java
+++ b/service/src/com/android/car/CarFeatureController.java
@@ -75,6 +75,7 @@
Car.PROJECTION_SERVICE,
Car.PROPERTY_SERVICE,
Car.TEST_SERVICE,
+ Car.CAR_WATCHDOG_SERVICE,
// All items below here are deprecated, but still should be supported
Car.CAR_INSTRUMENT_CLUSTER_SERVICE,
Car.CABIN_SERVICE,