From e7fa12e46887277e39256c448c223f37f0217f24 Mon Sep 17 00:00:00 2001
From: Aaron Ding <aaronding@google.com>
Date: Mon, 25 Apr 2022 06:53:59 +0000
Subject: [PATCH] Revert "powerstats: set time limit as timeout for AoC"

This reverts commit e630cfaaa98fe11e1731e01085327de18f337b2e.

Reason for revert: align with ag/17935513 and ag/17935512

Change-Id: Ie2fff80785a0c7acee75d30cac9bf3b4f31699d2
---
 powerstats/ZumaCommonDataProviders.cpp | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/powerstats/ZumaCommonDataProviders.cpp b/powerstats/ZumaCommonDataProviders.cpp
index c3b31097..bcdd933e 100644
--- a/powerstats/ZumaCommonDataProviders.cpp
+++ b/powerstats/ZumaCommonDataProviders.cpp
@@ -102,7 +102,6 @@ void addPlaceholderEnergyConsumers(std::shared_ptr<PowerStats> p) {
 }
 
 void addAoC(std::shared_ptr<PowerStats> p) {
-    static const uint64_t TIMEOUT_MILLIS = 120;
     std::string prefix = "/sys/devices/platform/19000000.aoc/control/";
 
     // Add AoC cores (a32, ff1, hf0, and hf1)
@@ -115,7 +114,7 @@ void addAoC(std::shared_ptr<PowerStats> p) {
     std::vector<std::pair<std::string, std::string>> coreStates = {
             {"DWN", "off"}, {"RET", "retention"}, {"WFI", "wfi"}};
     p->addStateResidencyDataProvider(std::make_unique<AocStateResidencyDataProvider>(coreIds,
-            coreStates, TIMEOUT_MILLIS));
+            coreStates));
 
     // Add AoC voltage stats
     std::vector<std::pair<std::string, std::string>> voltageIds = {
@@ -126,8 +125,7 @@ void addAoC(std::shared_ptr<PowerStats> p) {
                                                                       {"UUD", "ultra_underdrive"},
                                                                       {"UD", "underdrive"}};
     p->addStateResidencyDataProvider(
-            std::make_unique<AocStateResidencyDataProvider>(voltageIds, voltageStates,
-                    TIMEOUT_MILLIS));
+            std::make_unique<AocStateResidencyDataProvider>(voltageIds, voltageStates));
 
     // Add AoC monitor mode
     std::vector<std::pair<std::string, std::string>> monitorIds = {
@@ -137,8 +135,7 @@ void addAoC(std::shared_ptr<PowerStats> p) {
             {"MON", "mode"},
     };
     p->addStateResidencyDataProvider(
-            std::make_unique<AocStateResidencyDataProvider>(monitorIds, monitorStates,
-                    TIMEOUT_MILLIS));
+            std::make_unique<AocStateResidencyDataProvider>(monitorIds, monitorStates));
 
     // Add AoC restart count
     const GenericStateResidencyDataProvider::StateResidencyConfig restartCountConfig = {