Revert "Add HAL method to return SupportInfo object for PowerHAL"
Revert submission 29740067-support_info
Reason for revert: Droidmonitor created revert due to b/375690119. Will be verifying through ABTD before submission.
Reverted changes: /q/submissionid:29740067-support_info
Change-Id: I32a91871c5ba7828d3b087bf1d6d6f983072610a
diff --git a/power/aidl/default/Power.cpp b/power/aidl/default/Power.cpp
index 36d0055..64294e5 100644
--- a/power/aidl/default/Power.cpp
+++ b/power/aidl/default/Power.cpp
@@ -41,11 +41,6 @@
ndk::enum_range<Boost>().end()};
const std::vector<Mode> MODE_RANGE{ndk::enum_range<Mode>().begin(), ndk::enum_range<Mode>().end()};
-template <class T>
-constexpr size_t enum_size() {
- return static_cast<size_t>(*(ndk::enum_range<T>().end() - 1)) + 1;
-}
-
ScopedAStatus Power::setMode(Mode type, bool enabled) {
LOG(VERBOSE) << "Power setMode: " << static_cast<int32_t>(type) << " to: " << enabled;
return ScopedAStatus::ok();
@@ -110,30 +105,11 @@
return ndk::ScopedAStatus::ok();
}
-ndk::ScopedAStatus Power::getHintSessionPreferredRate(int64_t* outNanoseconds) {
+ScopedAStatus Power::getHintSessionPreferredRate(int64_t* outNanoseconds) {
*outNanoseconds = std::chrono::nanoseconds(1ms).count();
return ScopedAStatus::ok();
}
-template <class E>
-int64_t bitsForEnum() {
- return static_cast<int64_t>(std::bitset<enum_size<E>()>().set().to_ullong());
-}
-
-ndk::ScopedAStatus Power::getSupportInfo(SupportInfo* _aidl_return) {
- static SupportInfo supportInfo = {
- .usesSessions = false,
- .modes = bitsForEnum<Mode>(),
- .boosts = bitsForEnum<Boost>(),
- .sessionHints = 0,
- .sessionModes = 0,
- .sessionTags = 0,
- };
- // Copy the support object into the binder
- *_aidl_return = supportInfo;
- return ndk::ScopedAStatus::ok();
-}
-
} // namespace example
} // namespace impl
} // namespace power