diff options
| author | Scott Randolph <randolphs@google.com> | 2018-05-21 20:27:57 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-05-21 20:27:57 -0700 |
| commit | 918ba5920cccdca8fb87adfb6a858a8720f81f32 (patch) | |
| tree | 715743a0643718024cd151ffb0f30d4a51c0bb85 /automotive | |
| parent | 5154e5578c6e69610152f3a9edc45f84699a23a2 (diff) | |
| parent | 3fea05cd400172194adfb5fe8fe5c0e25ca292ab (diff) | |
| download | platform_hardware_interfaces-918ba5920cccdca8fb87adfb6a858a8720f81f32.tar.gz platform_hardware_interfaces-918ba5920cccdca8fb87adfb6a858a8720f81f32.tar.bz2 platform_hardware_interfaces-918ba5920cccdca8fb87adfb6a858a8720f81f32.zip | |
Fix name of Wheel to VehicleAreaWheel
am: 3fea05cd40
Change-Id: I8d1fbac4d7f00792ea399a033b6f58626adcff53
Diffstat (limited to 'automotive')
| -rw-r--r-- | automotive/vehicle/2.0/Android.bp | 2 | ||||
| -rw-r--r-- | automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultConfig.h | 3 | ||||
| -rw-r--r-- | automotive/vehicle/2.0/types.hal | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/automotive/vehicle/2.0/Android.bp b/automotive/vehicle/2.0/Android.bp index 91255d0d15..6af774e467 100644 --- a/automotive/vehicle/2.0/Android.bp +++ b/automotive/vehicle/2.0/Android.bp @@ -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, } diff --git a/automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultConfig.h b/automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultConfig.h index 80f8df49f5..4ae94c0011 100644 --- a/automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultConfig.h +++ b/automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultConfig.h @@ -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); diff --git a/automotive/vehicle/2.0/types.hal b/automotive/vehicle/2.0/types.hal index d30aa6e4a8..a031ee982d 100644 --- a/automotive/vehicle/2.0/types.hal +++ b/automotive/vehicle/2.0/types.hal @@ -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, |