Evolution-X-Tensor/device_google_gs201
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

powerstats: include WLAN data provider in PowerStatsHAL am: 46a0ab6018

Browse source 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/19449272

Change-Id: I06923f4c996289775388ad9185f4cd34d05299e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Darren Hsu 2022-07-29 04:01:22 +00:00 • committed by Automerger Merge Worker
commit 60d109a407
1 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
powerstats/Gs201CommonDataProviders.cpp
View file

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