From a05a8c3854c5985490eccc627067b57d2d1a7f2f Mon Sep 17 00:00:00 2001
From: Benjamin Schwartz <bsschwar@google.com>
Date: Tue, 1 Jun 2021 17:17:03 -0700
Subject: [PATCH] powerstats: Remove Wifi and BT placeholder consumers

Bug: 185392117
Test: dumpsys android.hardware.power.stats.IPowerStats/default
Change-Id: I4ee4837f882c2666e99c02836dd3c850871b420b
---
 powerstats/Gs101CommonDataProviders.cpp | 63 -------------------------
 1 file changed, 63 deletions(-)

diff --git a/powerstats/Gs101CommonDataProviders.cpp b/powerstats/Gs101CommonDataProviders.cpp
index 87bad6ee..447d5664 100644
--- a/powerstats/Gs101CommonDataProviders.cpp
+++ b/powerstats/Gs101CommonDataProviders.cpp
@@ -44,65 +44,6 @@ using aidl::android::hardware::power::stats::PowerStatsEnergyConsumer;
 
 constexpr char kBootHwSoCRev[] = "ro.boot.hw.soc.rev";
 
-// TODO (b/181070764) (b/182941084):
-// Remove this when Wifi/BT energy consumption models are available or revert before ship
-using aidl::android::hardware::power::stats::EnergyConsumerResult;
-using aidl::android::hardware::power::stats::Channel;
-using aidl::android::hardware::power::stats::EnergyMeasurement;
-class PlaceholderEnergyConsumer : public PowerStats::IEnergyConsumer {
-  public:
-    PlaceholderEnergyConsumer(std::shared_ptr<PowerStats> p, EnergyConsumerType type,
-            std::string name) : kType(type), kName(name), mPowerStats(p), mChannelId(-1) {
-        std::vector<Channel> channels;
-        mPowerStats->getEnergyMeterInfo(&channels);
-
-        for (const auto &c : channels) {
-            if (c.name == "VSYS_PWR_WLAN_BT") {
-                mChannelId = c.id;
-                break;
-            }
-        }
-    }
-    std::pair<EnergyConsumerType, std::string> getInfo() override { return {kType, kName}; }
-
-    std::optional<EnergyConsumerResult> getEnergyConsumed() override {
-        int64_t totalEnergyUWs = 0;
-        int64_t timestampMs = 0;
-        if (mChannelId != -1) {
-            std::vector<EnergyMeasurement> measurements;
-            if (mPowerStats->readEnergyMeter({mChannelId}, &measurements).isOk()) {
-                for (const auto &m : measurements) {
-                    totalEnergyUWs += m.energyUWs;
-                    timestampMs = m.timestampMs;
-                }
-            } else {
-                LOG(ERROR) << "Failed to read energy meter";
-                return {};
-            }
-        }
-
-        return EnergyConsumerResult{.timestampMs = timestampMs,
-                                .energyUWs = totalEnergyUWs>>1};
-    }
-
-    std::string getConsumerName() override {
-        return kName;
-    };
-
-  private:
-    const EnergyConsumerType kType;
-    const std::string kName;
-    std::shared_ptr<PowerStats> mPowerStats;
-    int32_t mChannelId;
-};
-
-void addPlaceholderEnergyConsumers(std::shared_ptr<PowerStats> p) {
-    p->addEnergyConsumer(
-            std::make_unique<PlaceholderEnergyConsumer>(p, EnergyConsumerType::WIFI, "Wifi"));
-    p->addEnergyConsumer(
-            std::make_unique<PlaceholderEnergyConsumer>(p, EnergyConsumerType::BLUETOOTH, "BT"));
-}
-
 void addAoC(std::shared_ptr<PowerStats> p) {
     std::string prefix = "/sys/devices/platform/19000000.aoc/control/";
 
@@ -709,10 +650,6 @@ void addGs101CommonDataProviders(std::shared_ptr<PowerStats> p) {
     addPowerDomains(p);
     addDevfreq(p);
     addTPU(p);
-
-    // TODO (b/181070764) (b/182941084):
-    // Remove this when Wifi/BT energy consumption models are available or revert before ship
-    addPlaceholderEnergyConsumers(p);
 }
 
 void addNFC(std::shared_ptr<PowerStats> p, const std::string& path) {