Revert "powerstats: timeout mechanism for AoC data provider"
Revert submission 17442015-powerstats-aoc-timeout
Reason for revert: Causes PowerStatsHAL crashes (b/227578192)
Reverted Changes:
I9a9eb27fa:powerstats: set time limit as timeout for AoC
Ib70000580:powerstats: timeout mechanism for AoC data provide...
Ied599054c:Revert "powerstats: disable AoC power stats report...
Iaf5af43eb:powerstats: set time limit as timeout for AoC
Change-Id: I53e280871197aaf003d9ef3e5e0cb4c79f486cc8
diff --git a/powerstats/include/AocStateResidencyDataProvider.h b/powerstats/include/AocStateResidencyDataProvider.h
index 150f335..5008912 100644
--- a/powerstats/include/AocStateResidencyDataProvider.h
+++ b/powerstats/include/AocStateResidencyDataProvider.h
@@ -27,8 +27,7 @@
class AocStateResidencyDataProvider : public PowerStats::IStateResidencyDataProvider {
public:
AocStateResidencyDataProvider(std::vector<std::pair<std::string, std::string>> ids,
- std::vector<std::pair<std::string, std::string>> states,
- const uint64_t timeoutMillis);
+ std::vector<std::pair<std::string, std::string>> states);
~AocStateResidencyDataProvider() = default;
bool getStateResidencies(
std::unordered_map<std::string, std::vector<StateResidency>> *residencies) override;
@@ -37,12 +36,10 @@
private:
std::unordered_map<std::string /* entity name */,
std::vector<std::unique_ptr<GenericStateResidencyDataProvider>> /* providers */> mProviders;
- int32_t mStateCount;
- uint64_t mTimeoutMillis;
};
} // namespace stats
} // namespace power
} // namespace hardware
} // namespace android
-} // namespace aidl
+} // namespace aidl
\ No newline at end of file