diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-12-07 23:57:44 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2023-12-07 23:57:44 +0000 |
| commit | e7bd766ce456481d882c807264e37afca2127b69 (patch) | |
| tree | efbb51f9093948275661740d39c521eed409f54c | |
| parent | 14503790709594f72cd320449a05ed06877c1228 (diff) | |
| parent | bdd2622257b663ee6018649e5789927f5a01d314 (diff) | |
| download | car-e7bd766ce456481d882c807264e37afca2127b69.tar.gz | |
Merge "Use getPropConfig instead of getConfig." into main
3 files changed, 3 insertions, 3 deletions
diff --git a/emulator/vhal_aidl/VehicleEmulator/EmulatedVehicleHardware.cpp b/emulator/vhal_aidl/VehicleEmulator/EmulatedVehicleHardware.cpp index 941d4f8..6eb7010 100644 --- a/emulator/vhal_aidl/VehicleEmulator/EmulatedVehicleHardware.cpp +++ b/emulator/vhal_aidl/VehicleEmulator/EmulatedVehicleHardware.cpp @@ -175,7 +175,7 @@ std::vector<VehiclePropValuePool::RecyclableType> EmulatedVehicleHardware::getAl EmulatedVehicleHardware::ConfigResultType EmulatedVehicleHardware::getPropConfig(int32_t propId) const { - return mServerSidePropStore->getConfig(propId); + return mServerSidePropStore->getPropConfig(propId); } bool EmulatedVehicleHardware::isInQemu() { diff --git a/emulator/vhal_aidl/VehicleEmulator/VehicleEmulator.cpp b/emulator/vhal_aidl/VehicleEmulator/VehicleEmulator.cpp index b09b8b9..73ffeef 100644 --- a/emulator/vhal_aidl/VehicleEmulator/VehicleEmulator.cpp +++ b/emulator/vhal_aidl/VehicleEmulator/VehicleEmulator.cpp @@ -105,7 +105,7 @@ void VehicleEmulator::doGetConfig(const VehicleEmulator::EmulatorMessage& rxMsg, } vhal_proto::VehiclePropConfig* protoCfg = respMsg->add_config(); - populateProtoVehicleConfig(*result.value(), protoCfg); + populateProtoVehicleConfig(result.value(), protoCfg); respMsg->set_status(vhal_proto::RESULT_OK); } diff --git a/emulator/vhal_aidl/VehicleEmulator/include/EmulatedVehicleHardware.h b/emulator/vhal_aidl/VehicleEmulator/include/EmulatedVehicleHardware.h index f5aaed1..c4a7b01 100644 --- a/emulator/vhal_aidl/VehicleEmulator/include/EmulatedVehicleHardware.h +++ b/emulator/vhal_aidl/VehicleEmulator/include/EmulatedVehicleHardware.h @@ -38,7 +38,7 @@ class EmulatedVehicleHardware : public FakeVehicleHardware { using AidlVehiclePropValue = aidl::android::hardware::automotive::vehicle::VehiclePropValue; using IVehicleBus = aidl::device::generic::car::emulator::IVehicleBus; using BnVehicleBusCallback = aidl::device::generic::car::emulator::BnVehicleBusCallback; - using ConfigResultType = android::base::Result<const aidl::android::hardware::automotive::vehicle::VehiclePropConfig*, VhalError>; + using ConfigResultType = android::base::Result<aidl::android::hardware::automotive::vehicle::VehiclePropConfig, VhalError>; EmulatedVehicleHardware(); EmulatedVehicleHardware(std::string_view default_config_dir, |