| 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
|
|
|