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>
This commit is contained in:
Aditya Chitnis
2022-12-01 17:28:13 +00:00
committed by Automerger Merge Worker

View File

@@ -82,8 +82,11 @@ int64_t msFromNs(int64_t nanos) {
} }
HalProxy::HalProxy() { HalProxy::HalProxy() {
const char* kMultiHalConfigFile = "/vendor/etc/sensors/hals.conf"; static const std::string kMultiHalConfigFiles[] = {"/vendor/etc/sensors/hals.conf",
initializeSubHalListFromConfigFile(kMultiHalConfigFile); "/odm/etc/sensors/hals.conf"};
for (const std::string& configFile : kMultiHalConfigFiles) {
initializeSubHalListFromConfigFile(configFile.c_str());
}
init(); init();
} }