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

Commit 918ba592 authored by Scott Randolph's avatar Scott Randolph Committed by android-build-merger
Browse files

Fix name of Wheel to VehicleAreaWheel 

am: 3fea05cd

Change-Id: I8d1fbac4d7f00792ea399a033b6f58626adcff53
parents 5154e557 3fea05cd

automotive/vehicle/2.0/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ hidl_interface { 
        "VehicleAreaDoor",

        "VehicleAreaMirror",

        "VehicleAreaSeat",

        "VehicleAreaWheel",

        "VehicleAreaWindow",

        "VehicleDisplay",

        "VehicleGear",
@@ -68,7 +69,6 @@ hidl_interface { 
        "VmsOfferingMessageIntegerValuesIndex",

        "VmsPublisherInformationIntegerValuesIndex",

        "VmsSubscriptionsStateIntegerValuesIndex",

        "Wheel",

    ],

    gen_java: true,

}

automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultConfig.h

+2 −1
Original line number Diff line number Diff line
@@ -40,7 +40,8 @@ constexpr int TRACTION_CONTROL_ACTIVE = (int)VehicleProperty::TRACTION_CONTROL_A 
constexpr int VEHICLE_MAP_SERVICE = (int)VehicleProperty::VEHICLE_MAP_SERVICE;

constexpr int WHEEL_TICK = (int)VehicleProperty::WHEEL_TICK;

constexpr int ALL_WHEELS =

    (int)(Wheel::LEFT_FRONT | Wheel::RIGHT_FRONT | Wheel::LEFT_REAR | Wheel::RIGHT_REAR);

    (int)(VehicleAreaWheel::LEFT_FRONT | VehicleAreaWheel::RIGHT_FRONT |

          VehicleAreaWheel::LEFT_REAR | VehicleAreaWheel::RIGHT_REAR);

constexpr int HVAC_LEFT = (int)(VehicleAreaSeat::ROW_1_LEFT | VehicleAreaSeat::ROW_2_LEFT |

                                VehicleAreaSeat::ROW_2_CENTER);

constexpr int HVAC_RIGHT = (int)(VehicleAreaSeat::ROW_1_RIGHT | VehicleAreaSeat::ROW_2_RIGHT);

automotive/vehicle/2.0/types.hal

+2 −2
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ enum VehicleArea : int32_t { 
    SEAT        = 0x05000000,

    /** DOOR maps to enum VehicleAreaDoor */

    DOOR        = 0x06000000,

    /** WHEEL maps to enum Wheel */

    /** WHEEL maps to enum VehicleAreaWheel */

    WHEEL       = 0x07000000,



    MASK        = 0x0f000000,
@@ -2746,7 +2746,7 @@ enum StatusCode : int32_t { 
    INTERNAL_ERROR = 5,

};



enum Wheel : int32_t {

enum VehicleAreaWheel : int32_t {

    UNKNOWN = 0x0,



    LEFT_FRONT = 0x1,

current.txt

+1 −1
Original line number Diff line number Diff line
@@ -311,7 +311,7 @@ f2904a4c108ad1b93eb2fa4e43b82bd01ce1ff26156316e49d1d9fc80dfecaad android.hardwar 
3b17c1fdfc389e0abe626c37054954b07201127d890c2bc05d47613ec1f4de4f android.hardware.automotive.evs@1.0::types

b3caf524c46a47d67e6453a34419e1881942d059e146cda740502670e9a752c3 android.hardware.automotive.vehicle@2.0::IVehicle

7ce8728b27600e840cacf0a832f6942819fe535f9d3797ae052d5eef5065921c android.hardware.automotive.vehicle@2.0::IVehicleCallback

2415300b470165ec227c7d9e5122d141ecca7231abed673573890934f8f79db1 android.hardware.automotive.vehicle@2.0::types

3562503f550f70eec7a688343a600fb92b74efb807a31452b70195dfab328b22 android.hardware.automotive.vehicle@2.0::types

32cc50cc2a7658ec613c0c2dd2accbf6a05113b749852879e818b8b7b438db19 android.hardware.bluetooth.a2dp@1.0::IBluetoothAudioHost

ff4be64d7992f8bec97dff37f35450e79b3430c61f85f54322ce45bef229dc3b android.hardware.bluetooth.a2dp@1.0::IBluetoothAudioOffload

27f22d2e873e6201f9620cf4d8e2facb25bd0dd30a2b911e441b4600d560fa62 android.hardware.bluetooth.a2dp@1.0::types