Skip to content

Latch the low-battery warning until the battery recovers #10081

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
djbarrios wants to merge 1 commit into
base: quattro
Choose a base branch
from
+23 −1
Open

Latch the low-battery warning until the battery recovers #10081

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion shell/plugins/services/battery/BatteryModel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,17 @@ function shouldWarnLowBattery(device, onBattery, dischargingState, threshold, al
if (level < 0) return { level: level, notify: false, notifiedLowBattery: false }

var low = isDischarging(device, onBattery, dischargingState) && level <= threshold

// Hysteresis: once warned, stay latched until the battery recovers well above
// the threshold. Clearing the latch the moment the device is not both
// discharging and at/under the threshold lets a brief charging/pending/unknown
// UPower blip at a still-low percentage re-arm the warning, so the next poll
// re-fires the critical notification and copies stack up on screen.
var recovered = level >= threshold + 10
return {
level: level,
notify: low && !alreadyNotified,
notifiedLowBattery: low
notifiedLowBattery: (alreadyNotified || low) && !recovered
}
}

Expand Down
15 changes: 15 additions & 0 deletions test/shell.d/battery-test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,19 @@ assertDeepEqual(
{ level: 40, notify: false, notifiedLowBattery: false },
'battery clears notified state after recovery'
)
assertDeepEqual(
battery.shouldWarnLowBattery({ isPresent: true, percentage: 0.1, state: discharging }, false, discharging, 10, true),
{ level: 10, notify: false, notifiedLowBattery: true },
'battery holds the latch through a non-discharging blip at a still-low level'
)
assertDeepEqual(
battery.shouldWarnLowBattery({ isPresent: true, percentage: 0.15, state: discharging }, true, discharging, 10, true),
{ level: 15, notify: false, notifiedLowBattery: true },
'battery holds the latch above the threshold until it recovers past the re-arm level'
)
assertDeepEqual(
battery.shouldWarnLowBattery({ isPresent: true, percentage: 0.2, state: discharging }, true, discharging, 10, true),
{ level: 20, notify: false, notifiedLowBattery: false },
'battery clears the latch once it recovers to the re-arm level'
)
JS