Evolution-X-Tensor/device_google_zuma
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

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

Change-Id: I804c9431266fbf2f3d6ee0c42c879aad65e8e5cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2023-05-18 04:48:18 +00:00 • committed by Automerger Merge Worker
commit 0b128ac62f
1 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

13
health/Health.cpp
View file

@ -231,6 +231,16 @@ ndk::ScopedAStatus HealthImpl::getDiskStats(std::vector<DiskStats>* out)
} // namespace aidl::android::hardware::health::implementation } // 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) { int main(int argc, char **argv) {
using ::aidl::android::hardware::health::implementation::HealthImpl; using ::aidl::android::hardware::health::implementation::HealthImpl;
@ -251,7 +261,8 @@ int main(int argc, char **argv) {
// In regular mode, start charger UI. // In regular mode, start charger UI.
#ifndef __ANDROID_RECOVERY__ #ifndef __ANDROID_RECOVERY__
LOG(INFO) << "Starting charger mode with UI."; 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 #endif
// In recovery, ignore --charger arg. // In recovery, ignore --charger arg.
LOG(INFO) << "Starting charger mode without UI."; LOG(INFO) << "Starting charger mode without UI.";