shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-11 09:18:07 +03:00
Code

battery-util: be more careful when determining whether we are in a low battery state

Browse Source 
Let's avoid assuming a low battery battery state if in doubt. That
means, handle errors reading battery state gracefully.
This commit is contained in:
Lennart Poettering 2023-06-05 12:12:03 +02:00
parent 319c46483e
commit c41e3605ec
1 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/shared/battery-util.c
View File

@ -233,6 +233,7 @@ int battery_read_capacity_percentage(sd_device *dev) {
/* If a battery whose percentage capacity is <= 5% exists, and we're not on AC power, return success */
int battery_is_discharging_and_low(void) {
_cleanup_(sd_device_enumerator_unrefp) sd_device_enumerator *e = NULL;
bool unsure = false, found_low = false;
sd_device *dev;
int r;
@ -250,9 +251,29 @@ int battery_is_discharging_and_low(void) {
if (r < 0)
return log_debug_errno(r, "Failed to initialize battery enumerator: %m");
FOREACH_DEVICE(e, dev)
if (battery_read_capacity_percentage(dev) > BATTERY_LOW_CAPACITY_LEVEL)
FOREACH_DEVICE(e, dev) {
int level;
level = battery_read_capacity_percentage(dev);
if (level < 0) {
unsure = true;
continue;
}
if (level > BATTERY_LOW_CAPACITY_LEVEL) /* Found a charged battery */
return false;
return true;
found_low = true;
}
/* If we found a battery whose state we couldn't read, don't assume we are in low battery state */
if (unsure)
return false;
/* Found no charged battery, but did find low batteries */
if (found_low)
return true;
/* Found neither charged nor low batteries? let's return that we aren't on low battery state */
return false;
}