Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2)

Unified Diff: trunk/src/ash/system/chromeos/power/tray_power.cc

Issue 16226023: Revert 203952 "cros: Update charging not reliable battery status" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « trunk/src/ash/ash_strings.grd ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/ash/system/chromeos/power/tray_power.cc
===================================================================
--- trunk/src/ash/system/chromeos/power/tray_power.cc (revision 203988)
+++ trunk/src/ash/system/chromeos/power/tray_power.cc (working copy)
@@ -217,12 +217,11 @@
// static
bool TrayPower::IsBatteryChargingUnreliable(
const chromeos::PowerSupplyStatus& supply_status) {
- // Sometimes devices can get into a state where the battery is almost fully
- // charged and the power subsystem reports "neither charging nor discharging"
- // despite the battery not at 100%. For now, only report unreliable charging
- // on USB.
- // TODO(derat): Update this when the power manager code is refactored for M29.
- return supply_status.battery_state == PowerSupplyStatus::CONNECTED_TO_USB;
+ return
+ supply_status.battery_state ==
+ PowerSupplyStatus::NEITHER_CHARGING_NOR_DISCHARGING ||
+ supply_status.battery_state ==
+ PowerSupplyStatus::CONNECTED_TO_USB;
}
// static
« no previous file with comments | « trunk/src/ash/ash_strings.grd ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698