| commit | 33883bd2df6e55cb78082b2b2dd4578a6c346324 | [log] [tgz] |
|---|---|---|
| author | Aditya Chitnis <chitnis@google.com> | Thu Dec 01 17:28:13 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Dec 01 17:28:13 2022 +0000 |
| tree | 6b32cbdd8eeb6ba934ed669008f96ccf6833dfee | |
| parent | 10d5c295744ed5a9bff959d044014ad668b5d033 [diff] | |
| parent | 938eae904880b322a205100bf7a4e788b94e9d42 [diff] |
Adding suport for multiple multihal config files am: e61b64baf5 am: 938eae9048 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2323216 Change-Id: Ieeb598cc62f68d175ad6456323f68cf1d42739a7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/sensors/common/default/2.X/multihal/HalProxy.cpp b/sensors/common/default/2.X/multihal/HalProxy.cpp index f44f5c4..31a17db 100644 --- a/sensors/common/default/2.X/multihal/HalProxy.cpp +++ b/sensors/common/default/2.X/multihal/HalProxy.cpp
@@ -82,8 +82,11 @@ } HalProxy::HalProxy() { - const char* kMultiHalConfigFile = "/vendor/etc/sensors/hals.conf"; - initializeSubHalListFromConfigFile(kMultiHalConfigFile); + static const std::string kMultiHalConfigFiles[] = {"/vendor/etc/sensors/hals.conf", + "/odm/etc/sensors/hals.conf"}; + for (const std::string& configFile : kMultiHalConfigFiles) { + initializeSubHalListFromConfigFile(configFile.c_str()); + } init(); }