am fc29dd14: am c9399a80: Merge "Fix overcounting of mobile radio" into mnc-dev

* commit 'fc29dd142e4f36aba5cf8d45fe06235e9c4d62f4':
  Fix overcounting of mobile radio
This commit is contained in:
Adam Lesinski
2015-05-06 02:37:08 +00:00
committed by Android Git Automerger

View File

@@ -52,7 +52,7 @@ public class MobileRadioPowerCalculator extends PowerCalculator {
public MobileRadioPowerCalculator(PowerProfile profile, BatteryStats stats) {
mPowerRadioOn = profile.getAveragePower(PowerProfile.POWER_RADIO_ACTIVE);
for (int i = 0; i < mPowerBins.length; i++) {
mPowerBins[i] = profile.getAveragePower(PowerProfile.POWER_RADIO_ACTIVE, i);
mPowerBins[i] = profile.getAveragePower(PowerProfile.POWER_RADIO_ON, i);
}
mPowerScan = profile.getAveragePower(PowerProfile.POWER_RADIO_SCANNING);
mStats = stats;
@@ -128,7 +128,9 @@ public class MobileRadioPowerCalculator extends PowerCalculator {
}
if (power != 0) {
app.noCoveragePercent = noCoverageTimeMs * 100.0 / signalTimeMs;
if (signalTimeMs != 0) {
app.noCoveragePercent = noCoverageTimeMs * 100.0 / signalTimeMs;
}
app.mobileActive = remainingActiveTimeMs;
app.mobileActiveCount = stats.getMobileRadioActiveUnknownCount(statsType);
app.mobileRadioPowerMah = power;