diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-12-09 04:01:20 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-12-09 04:01:20 +0000 |
commit | 8eb3b52a3d5df17c8db5dd9136414c392d01bb4d (patch) | |
tree | f307006e9eb1fa223fa54ce487eec248c0a14e30 | |
parent | 85b8d8590777f941fe3e9f8080331dcac0cd6ae4 (diff) | |
parent | 1958f9cd7946f44d778d7f51d86e221b71f45503 (diff) | |
download | car-8eb3b52a3d5df17c8db5dd9136414c392d01bb4d.tar.gz |
Snap for 11200327 from 1958f9cd7946f44d778d7f51d86e221b71f45503 to 24Q1-release
Change-Id: I0654b404f6355d56e78e114174cfb5137e1fb1dc
-rw-r--r-- | common/config.ini | 2 | ||||
-rw-r--r-- | common/config.ini.car_md | 2 | ||||
-rw-r--r-- | emulator/vhal_aidl/VehicleEmulator/EmulatedVehicleHardware.cpp | 2 | ||||
-rw-r--r-- | emulator/vhal_aidl/VehicleEmulator/VehicleEmulator.cpp | 2 | ||||
-rw-r--r-- | emulator/vhal_aidl/VehicleEmulator/include/EmulatedVehicleHardware.h | 2 |
5 files changed, 7 insertions, 3 deletions
diff --git a/common/config.ini b/common/config.ini index 8576698..d7c5abb 100644 --- a/common/config.ini +++ b/common/config.ini @@ -1,4 +1,6 @@ hw.audioInput=yes +hw.lcd.width=1408 +hw.lcd.height=792 hw.lcd.density=160 hw.cpu.ncore=6 hw.gpu.enabled=yes diff --git a/common/config.ini.car_md b/common/config.ini.car_md index 74e6abe..c290caf 100644 --- a/common/config.ini.car_md +++ b/common/config.ini.car_md @@ -1,4 +1,6 @@ hw.audioInput=yes +hw.lcd.width=1848 +hw.lcd.height=792 hw.lcd.density=160 hw.cpu.ncore=6 hw.gpu.enabled=yes 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, |