Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b2eb8ea8 authored by yuanhuihui's avatar yuanhuihui Committed by android-build-merger
Browse files

Merge "fix wrong algorithm in WifiPowerPerPacket()" 

am: 16e10074

Change-Id: I3bacf3deb99b10c5ae8fe22a02ad7066afc321e0
parents 5a07e3b2 16e10074

core/java/com/android/internal/os/WifiPowerEstimator.java

+2 −2
Original line number Diff line number Diff line
@@ -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