Update GsrComplianceRequirementType.
Update the name according to Car Service definition.
Test: m android.hardware.automotive.vehicle-update-api
Bug: 237005566
Change-Id: Idbc24b7b9e8b5d697d0921b79f5b903345f2cc7e
diff --git a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/GsrComplianceRequirementType.aidl b/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/GsrComplianceRequirementType.aidl
index 0d3a061..9c565ee 100644
--- a/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/GsrComplianceRequirementType.aidl
+++ b/automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/GsrComplianceRequirementType.aidl
@@ -35,5 +35,5 @@
@Backing(type="int") @VintfStability
enum GsrComplianceRequirementType {
GSR_COMPLIANCE_NOT_REQUIRED = 0,
- GSR_COMPLIANCE_REQUIRED_THROUGH_SYSTEM_IMAGE = 1,
+ GSR_COMPLIANCE_REQUIRED_V1 = 1,
}
diff --git a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/GsrComplianceRequirementType.aidl b/automotive/vehicle/aidl/android/hardware/automotive/vehicle/GsrComplianceRequirementType.aidl
index e0609d5..fb3ca9f 100644
--- a/automotive/vehicle/aidl/android/hardware/automotive/vehicle/GsrComplianceRequirementType.aidl
+++ b/automotive/vehicle/aidl/android/hardware/automotive/vehicle/GsrComplianceRequirementType.aidl
@@ -27,8 +27,9 @@
* GSR compliance is not required.
*/
GSR_COMPLIANCE_NOT_REQUIRED = 0,
+
/**
- * GSR compliance is required through system image.
+ * GSR compliance is required and the requirement solution version is 1.
*/
- GSR_COMPLIANCE_REQUIRED_THROUGH_SYSTEM_IMAGE = 1,
+ GSR_COMPLIANCE_REQUIRED_V1 = 1,
}
diff --git a/automotive/vehicle/aidl/impl/default_config/config/DefaultProperties.json b/automotive/vehicle/aidl/impl/default_config/config/DefaultProperties.json
index 137cb99..36b2200 100644
--- a/automotive/vehicle/aidl/impl/default_config/config/DefaultProperties.json
+++ b/automotive/vehicle/aidl/impl/default_config/config/DefaultProperties.json
@@ -2253,7 +2253,7 @@
"property": "VehicleProperty::GENERAL_SAFETY_REGULATION_COMPLIANCE_REQUIREMENT",
"defaultValue": {
"int32Values": [
- "GsrComplianceRequirementType::GSR_COMPLIANCE_REQUIRED_THROUGH_SYSTEM_IMAGE"
+ "GsrComplianceRequirementType::GSR_COMPLIANCE_REQUIRED_V1"
]
}
}