Merge "health: add suspend support for charger mode" into udc-d1-dev am: 795ca9ada2 am: c544c27ec3

Original change: https://googleplex-android-review.googlesource.com/c/device/google/zuma/+/23285996

Change-Id: I1ae59f9a683caa862004a1598368b4c62ef35007
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2023-05-18 05:35:03 +00:00 committed by Automerger Merge Worker
commit b064210c91

View file

@ -231,6 +231,16 @@ ndk::ScopedAStatus HealthImpl::getDiskStats(std::vector<DiskStats>* 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<Health>& 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<ChargerCallback>(binder));
auto charger_callback = std::make_shared<aidl::android::hardware::health::ChargerCallbackImpl>(binder);
return ChargerModeMain(binder, charger_callback);
#endif
// In recovery, ignore --charger arg.
LOG(INFO) << "Starting charger mode without UI.";