Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'c9399a80448ddc4a01d5a9c3d738f3077f70233c':
  Fix overcounting of mobile radio
This commit is contained in:
Adam Lesinski
2015-05-06 02:27:40 +00:00
committed by Android Git Automerger
parent a5d415adfa c9399a8044
commit fc29dd142e
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/com/android/internal/os/MobileRadioPowerCalculator.java
View File

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