| commit | a60abf9871560178a1c7addcd351c104ce3b8afa | [log] [tgz] |
|---|---|---|
| author | Yuncheol Heo <ycheo@google.com> | Wed Mar 31 23:23:31 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 31 23:23:31 2021 +0000 |
| tree | e9cb249c8d828a81f469bafe05794827478eaeb5 | |
| parent | 21007b0999d8416643903412c2f1c60a23bc090c [diff] | |
| parent | 23394308553b1aeb9d1b0875f5314efa635bc633 [diff] |
Merge "Remove the suffix LEGACY from CLUSTER_NAVIGATION_STATE_LEGACY." into sc-dev am: 2339430855 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/14054348 Change-Id: I00a7310f98bde860bf3182d0376d6aea5b4ea100
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 5dca1dc..19b0a35 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
@@ -1222,7 +1222,7 @@ { .config = { - .prop = toInt(VehicleProperty::CLUSTER_NAVIGATION_STATE_LEGACY), + .prop = toInt(VehicleProperty::CLUSTER_NAVIGATION_STATE), .access = VehiclePropertyAccess::WRITE, .changeMode = VehiclePropertyChangeMode::ON_CHANGE, },
diff --git a/automotive/vehicle/2.0/types.hal b/automotive/vehicle/2.0/types.hal index eabd7e1..1fe4bac 100644 --- a/automotive/vehicle/2.0/types.hal +++ b/automotive/vehicle/2.0/types.hal
@@ -3201,7 +3201,7 @@ * @change_mode VehiclePropertyChangeMode:ON_CHANGE * @access VehiclePropertyAccess:WRITE */ - CLUSTER_NAVIGATION_STATE_LEGACY = ( + CLUSTER_NAVIGATION_STATE = ( 0x0F38 | VehiclePropertyGroup:SYSTEM | VehiclePropertyType:BYTES