diff options
| author | Wei Wang <wvw@google.com> | 2020-11-13 10:59:00 -0800 |
|---|---|---|
| committer | YiHo Cheng <yihocheng@google.com> | 2020-12-29 06:58:08 +0000 |
| commit | b01769386162425219173147a4caf6aa583df139 (patch) | |
| tree | 1ee279cec9cb0531d1969d886d0b826e87892293 /power-libperfmgr | |
| parent | 95ebbcfe7361fa2fd1ad6931312a05136492cf23 (diff) | |
| download | pixel-b01769386162425219173147a4caf6aa583df139.tar.gz | |
power: add a property for config file
Test: build
Bug: 173222103
Bug: 174725590
Signed-off-by: Wei Wang <wvw@google.com>
Change-Id: I14e7e0aa349e446f6889cbfc9a914f5314438e6b
(cherry picked from commit cbfc4ab32a43ec59a70c0f7bd9bded591d0d3047)
Diffstat (limited to 'power-libperfmgr')
| -rw-r--r-- | power-libperfmgr/aidl/service.cpp | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/power-libperfmgr/aidl/service.cpp b/power-libperfmgr/aidl/service.cpp index aeb63564..5505524c 100644 --- a/power-libperfmgr/aidl/service.cpp +++ b/power-libperfmgr/aidl/service.cpp @@ -31,16 +31,21 @@ using aidl::google::hardware::power::impl::pixel::Power; using aidl::google::hardware::power::impl::pixel::PowerExt; using ::android::perfmgr::HintManager; -constexpr char kPowerHalConfigPath[] = "/vendor/etc/powerhint.json"; -constexpr char kPowerHalInitProp[] = "vendor.powerhal.init"; +constexpr std::string_view kPowerHalInitProp("vendor.powerhal.init"); +constexpr std::string_view kConfigProperty("vendor.powerhal.config"); +constexpr std::string_view kConfigDefaultFileName("powerhint.json"); int main() { - LOG(INFO) << "Pixel Power HAL AIDL Service with Extension is starting."; + const std::string config_path = + "/vendor/etc/" + + android::base::GetProperty(kConfigProperty.data(), kConfigDefaultFileName.data()); + LOG(INFO) << "Pixel Power HAL AIDL Service with Extension is starting with config: " + << config_path; // Parse config but do not start the looper - std::shared_ptr<HintManager> hm = HintManager::GetFromJSON(kPowerHalConfigPath, false); + std::shared_ptr<HintManager> hm = HintManager::GetFromJSON(config_path, false); if (!hm) { - LOG(FATAL) << "Invalid config: " << kPowerHalConfigPath; + LOG(FATAL) << "Invalid config: " << config_path; } std::shared_ptr<DisplayLowPower> dlpw = std::make_shared<DisplayLowPower>(); @@ -64,7 +69,7 @@ int main() { LOG(INFO) << "Pixel Power HAL AIDL Service with Extension is started."; std::thread initThread([&]() { - ::android::base::WaitForProperty(kPowerHalInitProp, "1"); + ::android::base::WaitForProperty(kPowerHalInitProp.data(), "1"); hm->Start(); dlpw->Init(); }); |