diff options
| author | Ram Periathiruvadi <ramperry@google.com> | 2018-03-30 23:11:06 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-03-30 23:11:06 +0000 |
| commit | 3c95ae1688bf6651cdcf10f401025a7bc3b9df8e (patch) | |
| tree | 9f18e18e5db60e8d30a8c7248c94885cf10c8b18 /automotive | |
| parent | fc5a117fd16fb141f8a10dfab35053c97edbff01 (diff) | |
| parent | 899d09c3ff82ec14bd585f925e95ae2aaf2ff546 (diff) | |
| download | platform_hardware_interfaces-3c95ae1688bf6651cdcf10f401025a7bc3b9df8e.tar.gz platform_hardware_interfaces-3c95ae1688bf6651cdcf10f401025a7bc3b9df8e.tar.bz2 platform_hardware_interfaces-3c95ae1688bf6651cdcf10f401025a7bc3b9df8e.zip | |
Merge "Deprecate DRIVING_STATUS vehicle property." into pi-dev
am: 899d09c3ff
Change-Id: I658ea31e4adeb8ba9cb0ae55c911a1a3eec49e00
Diffstat (limited to 'automotive')
| -rw-r--r-- | automotive/vehicle/2.0/Android.bp | 1 | ||||
| -rw-r--r-- | automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultConfig.h | 8 | ||||
| -rw-r--r-- | automotive/vehicle/2.0/types.hal | 27 |
3 files changed, 0 insertions, 36 deletions
diff --git a/automotive/vehicle/2.0/Android.bp b/automotive/vehicle/2.0/Android.bp index 902a4e8310..3e32b3e891 100644 --- a/automotive/vehicle/2.0/Android.bp +++ b/automotive/vehicle/2.0/Android.bp @@ -43,7 +43,6 @@ hidl_interface { "VehicleAreaWindow", "VehicleAreaZone", "VehicleDisplay", - "VehicleDrivingStatus", "VehicleGear", "VehicleHvacFanDirection", "VehicleHwKeyInputAction", 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 e05b333935..479f8af624 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 @@ -346,14 +346,6 @@ const ConfigDeclaration kVehicleProperties[]{ {.config = { - .prop = toInt(VehicleProperty::DRIVING_STATUS), - .access = VehiclePropertyAccess::READ, - .changeMode = VehiclePropertyChangeMode::ON_CHANGE, - }, - .initialValue = {.int32Values = {toInt(VehicleDrivingStatus::UNRESTRICTED)}}}, - - {.config = - { .prop = toInt(VehicleProperty::GEAR_SELECTION), .access = VehiclePropertyAccess::READ, .changeMode = VehiclePropertyChangeMode::ON_CHANGE, diff --git a/automotive/vehicle/2.0/types.hal b/automotive/vehicle/2.0/types.hal index 87daedc9b9..93a903f76a 100644 --- a/automotive/vehicle/2.0/types.hal +++ b/automotive/vehicle/2.0/types.hal @@ -467,19 +467,6 @@ enum VehicleProperty: int32_t { | VehicleArea:GLOBAL), /** - * Driving status policy. - * - * @change_mode VehiclePropertyChangeMode:ON_CHANGE - * @access VehiclePropertyAccess:READ - * @data_enum VehicleDrivingStatus - */ - DRIVING_STATUS = ( - 0x0404 - | VehiclePropertyGroup:SYSTEM - | VehiclePropertyType:INT32 - | VehicleArea:GLOBAL), - - /** * Warning for fuel low level. * * @change_mode VehiclePropertyChangeMode:ON_CHANGE @@ -2169,20 +2156,6 @@ enum VehiclePropertyStatus : int32_t { }; /** - * Car states. - * - * The driving states determine what features of the UI will be accessible. - */ -enum VehicleDrivingStatus : int32_t { - UNRESTRICTED = 0x00, - NO_VIDEO = 0x01, - NO_KEYBOARD_INPUT = 0x02, - NO_VOICE_INPUT = 0x04, - NO_CONFIG = 0x08, - LIMIT_MESSAGE_LEN = 0x10, -}; - -/** * Various gears which can be selected by user and chosen in system. */ enum VehicleGear: int32_t { |