| commit | 82db813b91de97df77ab72885d2c9f57fce448db | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Aug 26 00:17:38 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Aug 26 00:17:38 2020 +0000 |
| tree | 34e95756c0112864658c8eb3a42537efa6583dcb | |
| parent | 909219ccc294fe61582f3c3da953a176a3d16e82 [diff] | |
| parent | 35d0ddbc8e0dbb654c2329cc4174c30c3df92ad8 [diff] |
Merge "Assume UNSUPPORTED if the battery capacity level sysfs node does not exist." am: 35d0ddbc8e Original change: https://android-review.googlesource.com/c/platform/system/core/+/1398913 Change-Id: Ia7461d6a1f780fba97f2e33e4c0a3c30671ecc43
diff --git a/healthd/BatteryMonitor.cpp b/healthd/BatteryMonitor.cpp index 599f500..fd810cb 100644 --- a/healthd/BatteryMonitor.cpp +++ b/healthd/BatteryMonitor.cpp
@@ -79,7 +79,7 @@ // HIDL enum values are zero initialized, so they need to be initialized // properly. - health_info_2_1->batteryCapacityLevel = BatteryCapacityLevel::UNKNOWN; + health_info_2_1->batteryCapacityLevel = BatteryCapacityLevel::UNSUPPORTED; health_info_2_1->batteryChargeTimeToFullNowSeconds = (int64_t)Constants::BATTERY_CHARGE_TIME_TO_FULL_NOW_SECONDS_UNSUPPORTED; auto* props = &health_info_2_1->legacy.legacy;