diff --git a/healthd/BatteryMonitor.cpp b/healthd/BatteryMonitor.cpp index a1519da3b..06c8176e9 100644 --- a/healthd/BatteryMonitor.cpp +++ b/healthd/BatteryMonitor.cpp @@ -26,6 +26,8 @@ #include #include #include + +#include #include #include @@ -476,10 +478,16 @@ void BatteryMonitor::init(struct healthd_config *hc) { while ((entry = readdir(dir.get()))) { const char* name = entry->d_name; + std::vector::iterator itIgnoreName; if (!strcmp(name, ".") || !strcmp(name, "..")) continue; + itIgnoreName = find(hc->ignorePowerSupplyNames.begin(), + hc->ignorePowerSupplyNames.end(), String8(name)); + if (itIgnoreName != hc->ignorePowerSupplyNames.end()) + continue; + // Look for "type" file in each subdirectory path.clear(); path.appendFormat("%s/%s/type", POWER_SUPPLY_SYSFS_PATH, name); diff --git a/healthd/include/healthd/healthd.h b/healthd/include/healthd/healthd.h index c01e8d747..a90007199 100644 --- a/healthd/include/healthd/healthd.h +++ b/healthd/include/healthd/healthd.h @@ -22,6 +22,8 @@ #include #include +#include + // periodic_chores_interval_fast, periodic_chores_interval_slow: intervals at // which healthd wakes up to poll health state and perform periodic chores, // in units of seconds: @@ -71,6 +73,7 @@ struct healthd_config { int (*energyCounter)(int64_t *); int boot_min_cap; bool (*screen_on)(android::BatteryProperties *props); + std::vector ignorePowerSupplyNames; }; enum EventWakeup {