From 19b932eb41e9973ea52547d3494b96e272209048 Mon Sep 17 00:00:00 2001
From: Darren Hsu <darrenhsu@google.com>
Date: Tue, 26 Jul 2022 18:02:24 +0800
Subject: [PATCH] powerstats: remove bluetooth data provider on the specific
 device

The specific device uses QC solution on Bluetooth. Remove support
of Bluetooth state residency data provider in PowerStatsHAL on the
specific device.

Bug: 231395549
Test: dumpsys android.hardware.power.stats.IPowerStats/default
Change-Id: Ic94d9ca2ddefa5ac09bc83bf156a4972562506ea
Signed-off-by: Darren Hsu <darrenhsu@google.com>
---
 powerstats/Gs201CommonDataProviders.cpp       | 12 ++++++++++--
 powerstats/include/Gs201CommonDataProviders.h |  2 +-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/powerstats/Gs201CommonDataProviders.cpp b/powerstats/Gs201CommonDataProviders.cpp
index e361fc56..35e405d4 100644
--- a/powerstats/Gs201CommonDataProviders.cpp
+++ b/powerstats/Gs201CommonDataProviders.cpp
@@ -632,10 +632,9 @@ void addPixelStateResidencyDataProvider(std::shared_ptr<PowerStats> p) {
     p->addStateResidencyDataProvider(std::move(pixelSdp));
 }
 
-void addGs201CommonDataProviders(std::shared_ptr<PowerStats> p) {
+void addCommonDataProviders(std::shared_ptr<PowerStats> p) {
     setEnergyMeter(p);
 
-    addPixelStateResidencyDataProvider(p);
     addAoC(p);
     addDvfsStats(p);
     addSoC(p);
@@ -655,6 +654,15 @@ void addGs201CommonDataProviders(std::shared_ptr<PowerStats> p) {
     addPlaceholderEnergyConsumers(p);
 }
 
+void addGs201CommonDataProviders(std::shared_ptr<PowerStats> p) {
+    addCommonDataProviders(p);
+    addPixelStateResidencyDataProvider(p);
+}
+
+void addGs201CommonDataProvidersQc(std::shared_ptr<PowerStats> p) {
+    addCommonDataProviders(p);
+}
+
 void addNFC(std::shared_ptr<PowerStats> p, const std::string& path) {
     const GenericStateResidencyDataProvider::StateResidencyConfig nfcStateConfig = {
         .entryCountSupported = true,
diff --git a/powerstats/include/Gs201CommonDataProviders.h b/powerstats/include/Gs201CommonDataProviders.h
index a4b9232a..9fca9ba9 100644
--- a/powerstats/include/Gs201CommonDataProviders.h
+++ b/powerstats/include/Gs201CommonDataProviders.h
@@ -21,5 +21,5 @@
 using aidl::android::hardware::power::stats::PowerStats;
 
 void addGs201CommonDataProviders(std::shared_ptr<PowerStats> p);
-
+void addGs201CommonDataProvidersQc(std::shared_ptr<PowerStats> p);
 void addNFC(std::shared_ptr<PowerStats> p, const std::string& path);