Make CarNavigationStatusManager optional.
Some Car may not have Instrucment Cluster.
Bug: 155343605
Test: atest AndroidCarApiTest
Change-Id: Iefc7765fab01efafaafee0fc7e189b6a7b0148b5
diff --git a/car-lib/src/android/car/Car.java b/car-lib/src/android/car/Car.java
index cd85b2c..3160e9e 100644
--- a/car-lib/src/android/car/Car.java
+++ b/car-lib/src/android/car/Car.java
@@ -161,7 +161,7 @@
public static final String AUDIO_SERVICE = "audio";
/** Service name for {@link CarNavigationStatusManager} */
- @MandatoryFeature
+ @OptionalFeature
public static final String CAR_NAVIGATION_SERVICE = "car_navigation_service";
/** Service name for {@link CarOccupantZoneManager} */
diff --git a/service/src/com/android/car/CarFeatureController.java b/service/src/com/android/car/CarFeatureController.java
index e8f5885..1742e4f 100644
--- a/service/src/com/android/car/CarFeatureController.java
+++ b/service/src/com/android/car/CarFeatureController.java
@@ -68,7 +68,6 @@
Car.CAR_DRIVING_STATE_SERVICE,
Car.CAR_INPUT_SERVICE,
Car.CAR_MEDIA_SERVICE,
- Car.CAR_NAVIGATION_SERVICE,
Car.CAR_OCCUPANT_ZONE_SERVICE,
Car.CAR_TRUST_AGENT_ENROLLMENT_SERVICE,
Car.CAR_USER_SERVICE,
@@ -90,6 +89,7 @@
private static final HashSet<String> OPTIONAL_FEATURES = new HashSet<>(Arrays.asList(
CarFeatures.FEATURE_CAR_USER_NOTICE_SERVICE,
+ Car.CAR_NAVIGATION_SERVICE,
Car.DIAGNOSTIC_SERVICE,
Car.OCCUPANT_AWARENESS_SERVICE,
Car.STORAGE_MONITORING_SERVICE,
diff --git a/tests/android_car_api_test/src/android/car/apitest/CarFeatureTest.java b/tests/android_car_api_test/src/android/car/apitest/CarFeatureTest.java
index 092cbcb..ceddfee 100644
--- a/tests/android_car_api_test/src/android/car/apitest/CarFeatureTest.java
+++ b/tests/android_car_api_test/src/android/car/apitest/CarFeatureTest.java
@@ -42,7 +42,6 @@
Car.CAR_CONFIGURATION_SERVICE,
Car.CAR_DRIVING_STATE_SERVICE,
Car.CAR_MEDIA_SERVICE,
- Car.CAR_NAVIGATION_SERVICE,
Car.CAR_OCCUPANT_ZONE_SERVICE,
Car.CAR_TRUST_AGENT_ENROLLMENT_SERVICE,
Car.CAR_USER_SERVICE,
@@ -63,6 +62,7 @@
private static final List<String> OPTIONAL_FEATURES = Arrays.asList(
CarFeatures.FEATURE_CAR_USER_NOTICE_SERVICE,
+ Car.CAR_NAVIGATION_SERVICE,
Car.DIAGNOSTIC_SERVICE,
Car.STORAGE_MONITORING_SERVICE,
Car.VEHICLE_MAP_SERVICE
