Commit 9176ba07 authored by James Willcox's avatar James Willcox
Browse files

Bug 1250106 - Correctly set charging status and remaining time when battery...

Bug 1250106 - Correctly set charging status and remaining time when battery level is rounded to 1.0 r=bz
parent 0ca72f55
Loading
Loading
Loading
Loading
+7 −3
Original line number Diff line number Diff line
@@ -140,14 +140,18 @@ BatteryManager::UpdateFromBatteryInfo(const hal::BatteryInformation& aBatteryInf
    doc->NodePrincipal()->GetAppStatus(&status);
  }

  mCharging = aBatteryInfo.charging();
  mRemainingTime = aBatteryInfo.remainingTime();

  if (!nsContentUtils::IsChromeDoc(doc) &&
      status != nsIPrincipal::APP_STATUS_CERTIFIED)
  {
    mLevel = lround(mLevel * 10.0) / 10.0;
    if (mLevel == 1.0) {
      mCharging = false;
      mRemainingTime = kDefaultRemainingTime;
    }
  }

  mCharging = aBatteryInfo.charging();
  mRemainingTime = aBatteryInfo.remainingTime();

  // Add some guards to make sure the values are coherent.
  if (mLevel == 1.0 && mCharging == true &&