chromeos: Avoid notification for original Spring charger.

ash/system/chromeos/power/tray_power.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/system/chromeos/power/tray_power.h"
 
 #include "ash/ash_switches.h"
 #include "ash/shell.h"
 #include "ash/system/chromeos/power/power_status_view.h"
 #include "ash/system/date/date_view.h"
@@ skipping 215 matching lines @@
     message_center_->RemoveNotification(kNotificationId, false);
     return true;
   }
   return false;
 }
 
 bool TrayPower::UpdateNotificationState() {
   const PowerStatus& status = *PowerStatus::Get();
   if (!status.IsBatteryPresent() ||
       status.IsBatteryTimeBeingCalculated() ||
-      status.IsMainsChargerConnected()) {
+      status.IsMainsChargerConnected() ||
+      status.IsOriginalSpringChargerConnected()) {

[jennyz, 2014/01/27 18:03:37]

what if the user confirms they are using the safe spring charger, although it
has the same id as the original spring charger(bad one)?

     notification_state_ = NOTIFICATION_NONE;
     return false;
   }
 
   return status.IsUsbChargerConnected() ?
       UpdateNotificationStateForRemainingPercentage() :
       UpdateNotificationStateForRemainingTime();
 }
 
 bool TrayPower::UpdateNotificationStateForRemainingTime() {
   // The notification includes a rounded minutes value, so round the estimate
   // received from the power manager to match.
   const int remaining_minutes = static_cast<int>(
       PowerStatus::Get()->GetBatteryTimeToEmpty().InSecondsF() / 60.0 + 0.5);
 
-  if (remaining_minutes >= kNoWarningMinutes) {
+  if (remaining_minutes >= kNoWarningMinutes ||
+      PowerStatus::Get()->IsBatteryFull()) {

[Daniel Erat, 2014/01/27 17:36:26]

These IsBatteryFull() checks aren't necessary for the fix, but I'm leaning
slightly towards including them just to reduce the chances of something like
this happening again in the future.

[jennyz, 2014/01/27 18:03:37]

agree.

     notification_state_ = NOTIFICATION_NONE;
     return false;
   }
 
   switch (notification_state_) {
     case NOTIFICATION_NONE:
       if (remaining_minutes <= kCriticalMinutes) {
         notification_state_ = NOTIFICATION_CRITICAL;
         return true;
       }
@@ skipping 14 matching lines @@
   NOTREACHED();
   return false;
 }
 
 bool TrayPower::UpdateNotificationStateForRemainingPercentage() {
   // The notification includes a rounded percentage, so round the value received
   // from the power manager to match.
   const int remaining_percentage =
       PowerStatus::Get()->GetRoundedBatteryPercent();
 
-  if (remaining_percentage >= kNoWarningPercentage) {
+  if (remaining_percentage >= kNoWarningPercentage ||
+      PowerStatus::Get()->IsBatteryFull()) {
     notification_state_ = NOTIFICATION_NONE;
     return false;
   }
 
   switch (notification_state_) {
     case NOTIFICATION_NONE:
       if (remaining_percentage <= kCriticalPercentage) {
         notification_state_ = NOTIFICATION_CRITICAL;
         return true;
       }
@@ skipping 34 matching lines @@
 
   if (current_charger != UNKNOWN_CHARGER) {
     UMA_HISTOGRAM_ENUMERATION("Power.ChargerType",
                               current_charger,
                               CHARGER_TYPE_COUNT);
   }
 }
 
 }  // namespace internal
 }  // namespace ash