commit e23844b7a53c2386ee91aa5ed62a9117ca8dccb8
author Treehugger Robot <treehugger-gerrit@google.com> Thu Dec 01 19:39:32 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Dec 01 19:39:32 2022 +0000
tree 384be04d11583cfcb62c45d0aa751161ec9355c5
parent e61b64baf51e6219077e4a4fb704627fbc83b868
parent 157a8518baf45f94ae8c1620d217b901d0049237

Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/interfaces"

sensors/common/default/2.X/multihal/HalProxy.cpp

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();
 }