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

Commit 6f1a65aa authored by Michael Wachenschwanz's avatar Michael Wachenschwanz
Browse files

Utilize per RAT info to calculate modem power consumption 

The modem's power drain can vary greatly depending on what Radio Access
Technology (RAT) is being used and at what frequency. Utilize available
modem RAT and frequency data in the MobileRadioPowerCalculator.

Bug: 231331285
Test: atest MobileRadioPowerCalculatorTest

Change-Id: Ibe9e2842f9c3f1869a5564fbfc0c218d831cd940
parent 5a7b01a3

core/java/com/android/internal/power/ModemPowerProfile.java

+10 −6
Original line number Diff line number Diff line
@@ -158,11 +158,11 @@ public class ModemPowerProfile { 


    private static final SparseArray<String> MODEM_TX_LEVEL_NAMES = new SparseArray<>(5);

    static {

        MODEM_DRAIN_TYPE_NAMES.put(MODEM_TX_LEVEL_0, "0");

        MODEM_DRAIN_TYPE_NAMES.put(MODEM_TX_LEVEL_1, "1");

        MODEM_DRAIN_TYPE_NAMES.put(MODEM_TX_LEVEL_2, "2");

        MODEM_DRAIN_TYPE_NAMES.put(MODEM_TX_LEVEL_3, "3");

        MODEM_DRAIN_TYPE_NAMES.put(MODEM_TX_LEVEL_4, "4");

        MODEM_TX_LEVEL_NAMES.put(MODEM_TX_LEVEL_0, "0");

        MODEM_TX_LEVEL_NAMES.put(MODEM_TX_LEVEL_1, "1");

        MODEM_TX_LEVEL_NAMES.put(MODEM_TX_LEVEL_2, "2");

        MODEM_TX_LEVEL_NAMES.put(MODEM_TX_LEVEL_3, "3");

        MODEM_TX_LEVEL_NAMES.put(MODEM_TX_LEVEL_4, "4");

    }



    private static final int[] MODEM_TX_LEVEL_MAP = new int[]{
@@ -418,7 +418,10 @@ public class ModemPowerProfile { 
        return Double.NaN;

    }



    private static String keyToString(int key) {

    /**

     * Returns a human readable version of a key.

     */

    public static String keyToString(int key) {

        StringBuilder sb = new StringBuilder();

        final int drainType = key & MODEM_DRAIN_TYPE_MASK;

        appendFieldToString(sb, "drain", MODEM_DRAIN_TYPE_NAMES, drainType);
@@ -427,6 +430,7 @@ public class ModemPowerProfile { 
        if (drainType == MODEM_DRAIN_TYPE_TX) {

            final int txLevel = key & MODEM_TX_LEVEL_MASK;

            appendFieldToString(sb, "level", MODEM_TX_LEVEL_NAMES, txLevel);

            sb.append(",");

        }



        final int ratType = key & MODEM_RAT_TYPE_MASK;

services/core/java/com/android/server/power/stats/BatteryStatsImpl.java

+1 −0
Original line number Diff line number Diff line
@@ -12229,6 +12229,7 @@ public class BatteryStatsImpl extends BatteryStats { 
    @GuardedBy("this")

    private void incrementPerRatDataLocked(ModemActivityInfo deltaInfo, long elapsedRealtimeMs) {

        final int infoSize = deltaInfo.getSpecificInfoLength();









        if (infoSize == 1 && deltaInfo.getSpecificInfoRat(0)









                == AccessNetworkConstants.AccessNetworkType.UNKNOWN









                && deltaInfo.getSpecificInfoFrequencyRange(0)