| commit | 938eae904880b322a205100bf7a4e788b94e9d42 | [log] [tgz] |
|---|---|---|
| author | Aditya Chitnis <chitnis@google.com> | Thu Dec 01 16:58:59 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Dec 01 16:58:59 2022 +0000 |
| tree | c1c89aae1c0c9af37d695ce0d566780e90ab670b | |
| parent | 3a534ad8084e152089a969617fded4b1eefe3ee3 [diff] | |
| parent | e61b64baf51e6219077e4a4fb704627fbc83b868 [diff] |
Adding suport for multiple multihal config files am: e61b64baf5 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2323216 Change-Id: Ic60d09bf3d63f8acdaa8d973ddb3f68a67788d9f 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(); }