diff --git a/powerstats/Gs201CommonDataProviders.cpp b/powerstats/Gs201CommonDataProviders.cpp index 35e405d4..aca40b18 100644 --- a/powerstats/Gs201CommonDataProviders.cpp +++ b/powerstats/Gs201CommonDataProviders.cpp @@ -25,6 +25,7 @@ #include #include #include +#include #include #include @@ -41,6 +42,7 @@ using aidl::android::hardware::power::stats::GenericStateResidencyDataProvider; using aidl::android::hardware::power::stats::IioEnergyMeterDataProvider; using aidl::android::hardware::power::stats::PixelStateResidencyDataProvider; using aidl::android::hardware::power::stats::PowerStatsEnergyConsumer; +using aidl::android::hardware::power::stats::WlanStateResidencyDataProvider; // TODO (b/181070764) (b/182941084): // Remove this when Wifi/BT energy consumption models are available or revert before ship @@ -528,6 +530,12 @@ void addWifi(std::shared_ptr p) { cfgs)); } +void addWlan(std::shared_ptr p) { + p->addStateResidencyDataProvider(std::make_unique( + "WLAN", + "/sys/kernel/wifi/power_stats")); +} + void addUfs(std::shared_ptr p) { p->addStateResidencyDataProvider(std::make_unique("/sys/bus/platform/devices/14700000.ufs/ufs_stats/")); } @@ -643,7 +651,6 @@ void addCommonDataProviders(std::shared_ptr p) { addMobileRadio(p); addGNSS(p); addPCIe(p); - addWifi(p); addUfs(p); addPowerDomains(p); addDevfreq(p); @@ -657,10 +664,12 @@ void addCommonDataProviders(std::shared_ptr p) { void addGs201CommonDataProviders(std::shared_ptr p) { addCommonDataProviders(p); addPixelStateResidencyDataProvider(p); + addWifi(p); } void addGs201CommonDataProvidersQc(std::shared_ptr p) { addCommonDataProviders(p); + addWlan(p); } void addNFC(std::shared_ptr p, const std::string& path) {