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

Commit 1e8a0ef7 authored by shrikar's avatar shrikar
Browse files

Added access field to VehicleAreaConfig.aidl 

Changed VHAL version from V2 to V3 for VehicleAreaConfig changes

Bug: 290801790
Test: manual build
Change-Id: I20c85f2144b088ef2e70def32602c0d41c602d29
parent e1fb7b6d

automotive/vehicle/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ package { 
cc_defaults {

    name: "VehicleHalInterfaceDefaults",

    static_libs: [

        "android.hardware.automotive.vehicle-V2-ndk",

        "android.hardware.automotive.vehicle-V3-ndk",

        "android.hardware.automotive.vehicle.property-V3-ndk",

    ],

}

automotive/vehicle/aidl/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ aidl_interface { 
    srcs: [

        "android/hardware/automotive/vehicle/*.aidl",

    ],

    frozen: true,

    frozen: false,

    stability: "vintf",

    backend: {

        cpp: {

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

+1 −0
Original line number Diff line number Diff line
@@ -42,4 +42,5 @@ parcelable VehicleAreaConfig { 
  float minFloatValue;

  float maxFloatValue;

  @nullable long[] supportedEnumValues;

  android.hardware.automotive.vehicle.VehiclePropertyAccess access = android.hardware.automotive.vehicle.VehiclePropertyAccess.NONE;

}

automotive/vehicle/aidl/aidl_test/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ android_test { 
        ":IVehicleGeneratedJavaFiles",

    ],

    static_libs: [

        "android.hardware.automotive.vehicle-V2-java",

        "android.hardware.automotive.vehicle-V3-java",

        "android.hardware.automotive.vehicle.property-V3-java",

        "androidx.test.runner",

        "truth",

automotive/vehicle/aidl/android/hardware/automotive/vehicle/VehicleAreaConfig.aidl

+23 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package android.hardware.automotive.vehicle;



import android.hardware.automotive.vehicle.VehiclePropertyAccess;



@VintfStability

@JavaDerive(equals=true, toString=true)

parcelable VehicleAreaConfig {
@@ -47,4 +49,25 @@ parcelable VehicleAreaConfig { 
     * assumed all @data_enum values are supported unless specified through another mechanism.

     */

    @nullable long[] supportedEnumValues;



    /**

     * Defines if the area ID for this property is READ, WRITE or READ_WRITE. This only applies if

     * the property is defined in the framework as a READ_WRITE property. Access (if set) should be

     * equal to, or a superset of, the VehiclePropConfig.access of the property.

     *

     * For example, if a property is defined as READ_WRITE, but the OEM wants to specify certain

     * area Ids as READ-only, the corresponding areaIds should have an access set to READ, while the

     * others must be set to READ_WRITE. We do not support setting specific area Ids to WRITE-only

     * when the property is READ-WRITE.

     *

     * Exclusively one of VehiclePropConfig and the VehicleAreaConfigs should be specified for a

     * single property. If VehiclePropConfig.access is populated, none of the

     * VehicleAreaConfig.access values should be populated. If VehicleAreaConfig.access values are

     * populated, VehiclePropConfig.access must not be populated.

     *

     * VehicleAreaConfigs should not be partially populated with access. If the OEM wants to specify

     * access for one area Id, all other configs should be populated with their access levels as

     * well.

     */

    VehiclePropertyAccess access = VehiclePropertyAccess.NONE;

}