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

Merge "Calculate cellular radio value from modem.controller values." into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-05-24 06:11:27 +00:00
committed by Android (Google) Code Review
parent 004e01d388 39b29bc230
commit b82d3d7e74
1 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,11 +50,33 @@ 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_ON, i);
double temp =
profile.getAveragePowerOrDefault(PowerProfile.POWER_RADIO_ACTIVE, -1);
if (temp != -1) {
mPowerRadioOn = temp;
} else {
double sum = 0;
sum += profile.getAveragePower(PowerProfile.POWER_MODEM_CONTROLLER_RX);
for (int i = 0; i < mPowerBins.length; i++) {
sum += profile.getAveragePower(PowerProfile.POWER_MODEM_CONTROLLER_TX, i);
}
mPowerRadioOn = sum / (mPowerBins.length + 1);
}
mPowerScan = profile.getAveragePower(PowerProfile.POWER_RADIO_SCANNING);
temp = profile.getAveragePowerOrDefault(PowerProfile.POWER_RADIO_ON, -1);
if (temp != -1 ) {
for (int i = 0; i < mPowerBins.length; i++) {
mPowerBins[i] = profile.getAveragePower(PowerProfile.POWER_RADIO_ON, i);
}
} else {
double idle = profile.getAveragePower(PowerProfile.POWER_MODEM_CONTROLLER_IDLE);
mPowerBins[0] = idle * 25 / 180;
for (int i = 1; i < mPowerBins.length; i++) {
mPowerBins[i] = Math.max(1, idle / 256);
}
}
mPowerScan = profile.getAveragePowerOrDefault(PowerProfile.POWER_RADIO_SCANNING, 0);
mStats = stats;
}