Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 70ffeca3 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update GsrComplianceRequirementType."

parents 048085f7 c7763e42

automotive/vehicle/aidl/aidl_api/android.hardware.automotive.vehicle/current/android/hardware/automotive/vehicle/GsrComplianceRequirementType.aidl

+1 −1
Original line number Diff line number Diff line
@@ -35,5 +35,5 @@ package android.hardware.automotive.vehicle; 
@Backing(type="int") @VintfStability

enum GsrComplianceRequirementType {

  GSR_COMPLIANCE_NOT_REQUIRED = 0,

  GSR_COMPLIANCE_REQUIRED_THROUGH_SYSTEM_IMAGE = 1,

  GSR_COMPLIANCE_REQUIRED_V1 = 1,

}

automotive/vehicle/aidl/android/hardware/automotive/vehicle/GsrComplianceRequirementType.aidl

+3 −2
Original line number Diff line number Diff line
@@ -27,8 +27,9 @@ enum GsrComplianceRequirementType { 
     * 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,

}

automotive/vehicle/aidl/impl/default_config/config/DefaultProperties.json

+1 −1
Original line number Diff line number Diff line
@@ -2369,7 +2369,7 @@ 
            "property": "VehicleProperty::GENERAL_SAFETY_REGULATION_COMPLIANCE_REQUIREMENT",

            "defaultValue": {

                "int32Values": [

                    "GsrComplianceRequirementType::GSR_COMPLIANCE_REQUIRED_THROUGH_SYSTEM_IMAGE"

                    "GsrComplianceRequirementType::GSR_COMPLIANCE_REQUIRED_V1"

                ]

            }

        }