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

Commit af66916e authored by Eva Chen's avatar Eva Chen Committed by Android (Google) Code Review
Browse files

Merge changes from topic "vhal_v3" into main 

* changes:
  Add UNKNOWN to VehicleAreaSeat aidl.
  Update VHAL property version to v3.
parents 3bbf5ad0 46d65626

automotive/vehicle/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -22,6 +22,6 @@ cc_defaults { 
    name: "VehicleHalInterfaceDefaults",

    static_libs: [

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

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

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

    ],

}

automotive/vehicle/aidl/aidl_test/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ android_test { 
    ],

    static_libs: [

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

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

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

        "androidx.test.runner",

        "truth-prebuilt",

    ],

automotive/vehicle/aidl_property/Android.bp

+1 −2
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ aidl_interface { 
        // This HAL was originally part of android.hardware.automotive.vehicle

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

    ],

    frozen: true,

    frozen: false,

    stability: "vintf",

    backend: {

        cpp: {
@@ -52,7 +52,6 @@ aidl_interface { 
            version: "2",

            imports: [],

        },



    ],



}

automotive/vehicle/aidl_property/aidl_api/android.hardware.automotive.vehicle.property/current/android/hardware/automotive/vehicle/VehicleAreaSeat.aidl

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
package android.hardware.automotive.vehicle;

@Backing(type="int") @VintfStability

enum VehicleAreaSeat {

  UNKNOWN = 0x0000,

  ROW_1_LEFT = 0x0001,

  ROW_1_CENTER = 0x0002,

  ROW_1_RIGHT = 0x0004,

automotive/vehicle/aidl_property/android/hardware/automotive/vehicle/VehicleAreaSeat.aidl

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ package android.hardware.automotive.vehicle; 
@VintfStability

@Backing(type="int")

enum VehicleAreaSeat {

    UNKNOWN = 0x0000,

    ROW_1_LEFT = 0x0001,

    ROW_1_CENTER = 0x0002,

    ROW_1_RIGHT = 0x0004,