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

Commit 514f78de authored by Blake Kragten's avatar Blake Kragten Committed by android-build-merger
Browse files

Merge "Power Monitor Addition frameworks telephony:" am: bbd836d2 am: 6620246b 

am: 08f90288

Change-Id: I7ef75668d2b2522ff7b0648dff95818c55f5618d
parents 9d2ba98d 08f90288

proto/src/telephony.proto

+3 −0
Original line number Diff line number Diff line
@@ -2268,4 +2268,7 @@ message ModemPowerStats { 
  // Amount of time phone spends in various cellular

  // rx signal strength levels (ms)

  repeated int64 time_in_rx_signal_strength_level_ms = 14;



  // Actual monitored rail energy consumed by modem (mAh)

  optional double monitored_rail_energy_consumed_mah = 15;

}

src/java/com/android/internal/telephony/metrics/ModemPowerMetrics.java

+2 −0
Original line number Diff line number Diff line
@@ -70,6 +70,8 @@ public class ModemPowerMetrics { 
            long[] trx = stats.getTimeInRxSignalStrengthLevelMs();

            m.timeInRxSignalStrengthLevelMs = new long[trx.length];

            System.arraycopy(trx, 0, m.timeInRxSignalStrengthLevelMs, 0, trx.length);

            m.monitoredRailEnergyConsumedMah = stats.getMonitoredRailChargeConsumedMaMs()

                / ((double) DateUtils.HOUR_IN_MILLIS);

        }

        return m;

    }

src/java/com/android/internal/telephony/metrics/TelephonyMetrics.java

+3 −0
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ import com.android.internal.util.IndentingPrintWriter; 


import java.io.FileDescriptor;

import java.io.PrintWriter;

import java.text.DecimalFormat;

import java.util.ArrayDeque;

import java.util.ArrayList;

import java.util.Arrays;
@@ -535,6 +536,8 @@ public class TelephonyMetrics { 
        pw.println("Amount of time phone spent in various cellular "

                + "rx signal strength levels (ms): "

                + Arrays.toString(s.timeInRxSignalStrengthLevelMs));

        pw.println("Energy consumed across measured modem rails (mAh): "

                + new DecimalFormat("#.##").format(s.monitoredRailEnergyConsumedMah));

        pw.decreaseIndent();

        pw.println("Hardware Version: " + SystemProperties.get("ro.boot.revision", ""));

    }