From 2a3464431ca3d980af8e9bf03a4933f958ff53d9 Mon Sep 17 00:00:00 2001 From: Jack Wu Date: Wed, 17 May 2023 21:00:52 +0800 Subject: [PATCH] health: add suspend support for charger mode Override ChargerEnableSuspend() function to true to support suspend and resume in charger mode. Bug: 282142607 Test: Confirm the device enter suspend in charger mode Change-Id: I16f03da67a8830bf4130d67948601e0534d8aa27 Signed-off-by: Jack Wu --- health/Health.cpp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/health/Health.cpp b/health/Health.cpp index 92f721c2..f25e2f86 100644 --- a/health/Health.cpp +++ b/health/Health.cpp @@ -231,6 +231,16 @@ ndk::ScopedAStatus HealthImpl::getDiskStats(std::vector* out) } // namespace aidl::android::hardware::health::implementation +#ifndef __ANDROID_RECOVERY__ +namespace aidl::android::hardware::health { +class ChargerCallbackImpl : public ChargerCallback { + public: + ChargerCallbackImpl(const std::shared_ptr& service) : ChargerCallback(service) {} + bool ChargerEnableSuspend() override { return true; } +}; +} //namespace aidl::android::hardware::health +#endif // !__ANDROID_RECOVERY__ + int main(int argc, char **argv) { using ::aidl::android::hardware::health::implementation::HealthImpl; @@ -251,7 +261,8 @@ int main(int argc, char **argv) { // In regular mode, start charger UI. #ifndef __ANDROID_RECOVERY__ LOG(INFO) << "Starting charger mode with UI."; - return ChargerModeMain(binder, std::make_shared(binder)); + auto charger_callback = std::make_shared(binder); + return ChargerModeMain(binder, charger_callback); #endif // In recovery, ignore --charger arg. LOG(INFO) << "Starting charger mode without UI.";