From e60e17f781fc5527c2a80a0151bfdd7744fbc91c Mon Sep 17 00:00:00 2001 From: Yuncheol Heo Date: Wed, 31 Mar 2021 12:40:08 -0700 Subject: [PATCH] Remove the suffix LEGACY from CLUSTER_NAVIGATION_STATE_LEGACY. - It sounds awkward to have the suffix LEGACY for the new VHAL. Bug: 173454429 Test: atest ClusterHomeManagerTest ClusterHalServiceTest Change-Id: I4b79bed21859af3dee1efe2da420cb19c2aa19db --- automotive/vehicle/2.0/default/impl/vhal_v2_0/DefaultConfig.h | 2 +- automotive/vehicle/2.0/types.hal | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 5dca1dc0ff..19b0a35e8d 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 @@ const ConfigDeclaration kVehicleProperties[]{ { .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 eabd7e11fe..1fe4bac6e3 100644 --- a/automotive/vehicle/2.0/types.hal +++ b/automotive/vehicle/2.0/types.hal @@ -3201,7 +3201,7 @@ enum VehicleProperty : int32_t { * @change_mode VehiclePropertyChangeMode:ON_CHANGE * @access VehiclePropertyAccess:WRITE */ - CLUSTER_NAVIGATION_STATE_LEGACY = ( + CLUSTER_NAVIGATION_STATE = ( 0x0F38 | VehiclePropertyGroup:SYSTEM | VehiclePropertyType:BYTES