Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 29e1bf6b authored by Aditya Chitnis's avatar Aditya Chitnis Committed by Automerger Merge Worker
Browse files

Adding suport for multiple multihal config files am: e61b64ba am: 938eae90 am: 33883bd2 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2323216



Change-Id: Iee5189571370897c30b575ed42d05fcef79733e0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2bbf8ee8 33883bd2

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

+5 −2
Original line number Diff line number Diff line
@@ -82,8 +82,11 @@ int64_t msFromNs(int64_t nanos) { 
}



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

}