Merge "fix wrong algorithm in WifiPowerPerPacket()" am: 16e1007481

am: b2eb8ea894

Change-Id: I5ace39e2b6b679622f9c2ab27831a1e079541e32
This commit is contained in:
yuanhuihui
2016-09-19 18:40:37 +00:00
committed by android-build-merger

View File

@@ -38,13 +38,13 @@ public class WifiPowerEstimator extends PowerCalculator {
}
/**
* Return estimated power (in mAs) of sending a byte with the Wi-Fi radio.
* Return estimated power per Wi-Fi packet in mAh/packet where 1 packet = 2 KB.
*/
private static double getWifiPowerPerPacket(PowerProfile profile) {
final long WIFI_BPS = 1000000; // TODO: Extract average bit rates from system
final double WIFI_POWER = profile.getAveragePower(PowerProfile.POWER_WIFI_ACTIVE)
/ 3600;
return (WIFI_POWER / (((double)WIFI_BPS) / 8 / 2048)) / (60*60);
return WIFI_POWER / (((double)WIFI_BPS) / 8 / 2048);
}
@Override