| commit | be2e9bbbf90273fdcf04b2c229b8c8cb0199b661 | [log] [tgz] |
|---|---|---|
| author | Jack Wu <wjack@google.com> | Thu Feb 23 07:30:00 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Feb 23 07:30:00 2023 +0000 |
| tree | 7e5ac42099786eea1659ec64a8d4026276ea0852 | |
| parent | 2625f103ea407b3dd33ec9226c269fcc507af9c4 [diff] | |
| parent | a358f7d2f15e27c75ade5b8c3f29bdd9fa5c6082 [diff] |
Merge changes from topic "batteryStateOfHealth" am: a358f7d2f1 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2443774 Change-Id: Ie0cfe97e45c04d556112839349b7b0996bc3997c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/health/aidl/default/Health.cpp b/health/aidl/default/Health.cpp index 15a3dbc..f401643 100644 --- a/health/aidl/default/Health.cpp +++ b/health/aidl/default/Health.cpp
@@ -148,6 +148,11 @@ !res.isOk()) { LOG(WARNING) << "Cannot get First_usage_date: " << res.getDescription(); } + if (auto res = GetProperty<int64_t>(&battery_monitor_, ::android::BATTERY_PROP_STATE_OF_HEALTH, + 0, &out->batteryStateOfHealth); + !res.isOk()) { + LOG(WARNING) << "Cannot get Battery_state_of_health: " << res.getDescription(); + } return ndk::ScopedAStatus::ok(); }