diff options
| -rw-r--r-- | manifest.xml | 7 | ||||
| -rw-r--r-- | powerstats/service.cpp | 15 |
2 files changed, 12 insertions, 10 deletions
diff --git a/manifest.xml b/manifest.xml index cfbf0942..94c24fd0 100644 --- a/manifest.xml +++ b/manifest.xml @@ -240,11 +240,8 @@ <hal format="hidl"> <name>android.hardware.neuralnetworks</name> <transport>hwbinder</transport> - <version>1.0</version> - <interface> - <name>IDevice</name> - <instance>paintbox</instance> - </interface> + <fqname>@1.0::IDevice/paintbox</fqname> + <fqname>@1.1::IDevice/default</fqname> </hal> <hal format="hidl"> <name>android.hardware.nfc</name> diff --git a/powerstats/service.cpp b/powerstats/service.cpp index 261d210d..133c9bdf 100644 --- a/powerstats/service.cpp +++ b/powerstats/service.cpp @@ -16,6 +16,7 @@ #define LOG_TAG "android.hardware.power.stats@1.0-service.pixel" +#include <android-base/properties.h> #include <android/log.h> #include <binder/IPCThreadState.h> #include <binder/IServiceManager.h> @@ -52,6 +53,8 @@ using android::hardware::google::pixel::powerstats::WlanStateResidencyDataProvid int main(int /* argc */, char ** /* argv */) { ALOGE("power.stats service 1.0 is starting."); + bool isDebuggable = android::base::GetBoolProperty("ro.debuggable", false); + PowerStats *service = new PowerStats(); // Add power entities related to rpmh @@ -110,11 +113,13 @@ int main(int /* argc */, char ** /* argv */) { service->addStateResidencyDataProvider(socSdp); - // Add WLAN power entity - uint32_t wlanId = service->addPowerEntity("WLAN", PowerEntityType::SUBSYSTEM); - sp<WlanStateResidencyDataProvider> wlanSdp = - new WlanStateResidencyDataProvider(wlanId, "/d/wlan0/power_stats"); - service->addStateResidencyDataProvider(wlanSdp); + if (isDebuggable) { + // Add WLAN power entity + uint32_t wlanId = service->addPowerEntity("WLAN", PowerEntityType::SUBSYSTEM); + sp<WlanStateResidencyDataProvider> wlanSdp = + new WlanStateResidencyDataProvider(wlanId, "/d/wlan0/power_stats"); + service->addStateResidencyDataProvider(wlanSdp); + } // Add Power Entities that require the Aidl data provider sp<AidlStateResidencyDataProvider> aidlSdp = new AidlStateResidencyDataProvider(); |