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

Commit 415143da authored by Peter Wang's avatar Peter Wang Committed by Gerrit Code Review
Browse files

Merge "[Telephony Mainline] Expose hidden APIs and consts"

parents 17d1d950 98598bfe

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -44388,6 +44388,7 @@ package android.telephony { 
    method public abstract int getAsuLevel();

    method public abstract int getDbm();

    method @IntRange(from=android.telephony.CellSignalStrength.SIGNAL_STRENGTH_NONE_OR_UNKNOWN, to=android.telephony.CellSignalStrength.SIGNAL_STRENGTH_GREAT) public abstract int getLevel();

    method public static final int getNumSignalStrengthLevels();

    method public abstract int hashCode();

    field public static final int SIGNAL_STRENGTH_GOOD = 3; // 0x3

    field public static final int SIGNAL_STRENGTH_GREAT = 4; // 0x4

core/java/android/os/BatteryStats.java

+7 −7
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ import android.content.pm.ApplicationInfo; 
import android.server.ServerProtoEnums;

import android.service.batterystats.BatteryStatsServiceDumpHistoryProto;

import android.service.batterystats.BatteryStatsServiceDumpProto;

import android.telephony.SignalStrength;

import android.telephony.CellSignalStrength;

import android.telephony.TelephonyManager;

import android.text.format.DateFormat;

import android.util.ArrayMap;
@@ -2509,7 +2509,7 @@ public abstract class BatteryStats implements Parcelable { 
                new String[] {"in", "out", "em", "off"}),

        new BitDescription(HistoryItem.STATE_PHONE_SIGNAL_STRENGTH_MASK,

                HistoryItem.STATE_PHONE_SIGNAL_STRENGTH_SHIFT, "phone_signal_strength", "Pss",

                SignalStrength.SIGNAL_STRENGTH_NAMES,

                new String[] { "none", "poor", "moderate", "good", "great" },

                new String[] { "0", "1", "2", "3", "4" }),

        new BitDescription(HistoryItem.STATE_BRIGHTNESS_MASK,

                HistoryItem.STATE_BRIGHTNESS_SHIFT, "brightness", "Sb",
@@ -3856,14 +3856,14 @@ public abstract class BatteryStats implements Parcelable { 
        dumpLine(pw, 0 /* uid */, category, SCREEN_BRIGHTNESS_DATA, args);



        // Dump signal strength stats

        args = new Object[SignalStrength.NUM_SIGNAL_STRENGTH_BINS];

        for (int i=0; i<SignalStrength.NUM_SIGNAL_STRENGTH_BINS; i++) {

        args = new Object[CellSignalStrength.getNumSignalStrengthLevels()];

        for (int i = 0; i < CellSignalStrength.getNumSignalStrengthLevels(); i++) {

            args[i] = getPhoneSignalStrengthTime(i, rawRealtime, which) / 1000;

        }

        dumpLine(pw, 0 /* uid */, category, SIGNAL_STRENGTH_TIME_DATA, args);

        dumpLine(pw, 0 /* uid */, category, SIGNAL_SCANNING_TIME_DATA,

                getPhoneSignalScanningTime(rawRealtime, which) / 1000);

        for (int i=0; i<SignalStrength.NUM_SIGNAL_STRENGTH_BINS; i++) {

        for (int i = 0; i < CellSignalStrength.getNumSignalStrengthLevels(); i++) {

            args[i] = getPhoneSignalStrengthCount(i, which);

        }

        dumpLine(pw, 0 /* uid */, category, SIGNAL_STRENGTH_COUNT_DATA, args);
@@ -4931,7 +4931,7 @@ public abstract class BatteryStats implements Parcelable { 
            "good (-108dBm to -98dBm): ",

            "great (greater than -98dBm): "};

        didOne = false;

        final int numCellularRxBins = Math.min(SignalStrength.NUM_SIGNAL_STRENGTH_BINS,

        final int numCellularRxBins = Math.min(CellSignalStrength.getNumSignalStrengthLevels(),

            cellularRxSignalStrengthDescription.length);

        for (int i=0; i<numCellularRxBins; i++) {

            final long time = getPhoneSignalStrengthTime(i, rawRealtime, which);
@@ -8186,7 +8186,7 @@ public abstract class BatteryStats implements Parcelable { 
                which);



        // Phone signal strength (SIGNAL_STRENGTH_TIME_DATA and SIGNAL_STRENGTH_COUNT_DATA)

        for (int i = 0; i < SignalStrength.NUM_SIGNAL_STRENGTH_BINS; ++i) {

        for (int i = 0; i < CellSignalStrength.getNumSignalStrengthLevels(); ++i) {

            final long pssToken = proto.start(SystemProto.PHONE_SIGNAL_STRENGTH);

            proto.write(SystemProto.PhoneSignalStrength.NAME, i);

            dumpTimer(proto, SystemProto.PhoneSignalStrength.TOTAL, getPhoneSignalStrengthTimer(i),

core/java/android/os/connectivity/CellularBatteryStats.java

+4 −5
Original line number Diff line number Diff line
@@ -18,9 +18,8 @@ package android.os.connectivity; 
import android.os.BatteryStats;

import android.os.Parcel;

import android.os.Parcelable;



import android.telephony.CellSignalStrength;

import android.telephony.ModemActivityInfo;

import android.telephony.SignalStrength;



import java.util.Arrays;
@@ -209,7 +208,7 @@ public final class CellularBatteryStats implements Parcelable { 


  public void setTimeInRxSignalStrengthLevelMs(long[] t) {

    mTimeInRxSignalStrengthLevelMs = Arrays.copyOfRange(t, 0,

        Math.min(t.length, SignalStrength.NUM_SIGNAL_STRENGTH_BINS));

        Math.min(t.length, CellSignalStrength.getNumSignalStrengthLevels()));

    return;

  }
@@ -245,7 +244,7 @@ public final class CellularBatteryStats implements Parcelable { 
    mEnergyConsumedMaMs = 0;

    mTimeInRatMs = new long[BatteryStats.NUM_DATA_CONNECTION_TYPES];

    Arrays.fill(mTimeInRatMs, 0);

    mTimeInRxSignalStrengthLevelMs = new long[SignalStrength.NUM_SIGNAL_STRENGTH_BINS];

    mTimeInRxSignalStrengthLevelMs = new long[CellSignalStrength.getNumSignalStrengthLevels()];

    Arrays.fill(mTimeInRxSignalStrengthLevelMs, 0);

    mTxTimeMs = new long[ModemActivityInfo.TX_POWER_LEVELS];

    Arrays.fill(mTxTimeMs, 0);

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

+16 −14
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ import android.os.connectivity.CellularBatteryStats; 
import android.os.connectivity.GpsBatteryStats;

import android.os.connectivity.WifiBatteryStats;

import android.provider.Settings;

import android.telephony.CellSignalStrength;

import android.telephony.DataConnectionRealTimeInfo;

import android.telephony.ModemActivityInfo;

import android.telephony.ServiceState;
@@ -830,7 +831,7 @@ public class BatteryStatsImpl extends BatteryStats { 
    int mPhoneSignalStrengthBin = -1;

    int mPhoneSignalStrengthBinRaw = -1;

    final StopwatchTimer[] mPhoneSignalStrengthsTimer =

            new StopwatchTimer[SignalStrength.NUM_SIGNAL_STRENGTH_BINS];

            new StopwatchTimer[CellSignalStrength.getNumSignalStrengthLevels()];















    StopwatchTimer mPhoneSignalScanningTimer;
























@@ -5130,7 +5131,7 @@ public class BatteryStatsImpl extends BatteryStats {



























    void stopAllPhoneSignalStrengthTimersLocked(int except) {















        final long elapsedRealtime = mClocks.elapsedRealtime();













        for (int i = 0; i < SignalStrength.NUM_SIGNAL_STRENGTH_BINS; i++) {













        for (int i = 0; i < CellSignalStrength.getNumSignalStrengthLevels(); i++) {















            if (i == except) {















                continue;















            }









@@ -5145,7 +5146,7 @@ public class BatteryStatsImpl extends BatteryStats {













            // In this case we will always be STATE_OUT_OF_SERVICE, so need















            // to infer that we are scanning from other data.















            if (state == ServiceState.STATE_OUT_OF_SERVICE













                    && signalBin > SignalStrength.SIGNAL_STRENGTH_NONE_OR_UNKNOWN) {













                    && signalBin > CellSignalStrength.SIGNAL_STRENGTH_NONE_OR_UNKNOWN) {















                state = ServiceState.STATE_IN_SERVICE;















            }















        }









@@ -5168,7 +5169,7 @@ public class BatteryStatsImpl extends BatteryStats {













            // In this case we will always be STATE_OUT_OF_SERVICE, so need















            // to infer that we are scanning from other data.















            if (state == ServiceState.STATE_OUT_OF_SERVICE













                    && strengthBin > SignalStrength.SIGNAL_STRENGTH_NONE_OR_UNKNOWN) {













                    && strengthBin > CellSignalStrength.SIGNAL_STRENGTH_NONE_OR_UNKNOWN) {















                state = ServiceState.STATE_IN_SERVICE;















            }















        }









@@ -5185,7 +5186,7 @@ public class BatteryStatsImpl extends BatteryStats {













        // bin and have the scanning bit set.















        } else if (state == ServiceState.STATE_OUT_OF_SERVICE) {















            scanning = true;













            strengthBin = SignalStrength.SIGNAL_STRENGTH_NONE_OR_UNKNOWN;













            strengthBin = CellSignalStrength.SIGNAL_STRENGTH_NONE_OR_UNKNOWN;















            if (!mPhoneSignalScanningTimer.isRunningLocked()) {















                mHistoryCur.states |= HistoryItem.STATE_PHONE_SCANNING_FLAG;















                newHistory = true;










@@ -9785,7 +9786,7 @@ public class BatteryStatsImpl extends BatteryStats {













        mDeviceLightIdlingTimer = new StopwatchTimer(mClocks, null, -15, null, mOnBatteryTimeBase);















        mDeviceIdlingTimer = new StopwatchTimer(mClocks, null, -12, null, mOnBatteryTimeBase);















        mPhoneOnTimer = new StopwatchTimer(mClocks, null, -3, null, mOnBatteryTimeBase);













        for (int i=0; i<SignalStrength.NUM_SIGNAL_STRENGTH_BINS; i++) {













        for (int i = 0; i < CellSignalStrength.getNumSignalStrengthLevels(); i++) {















            mPhoneSignalStrengthsTimer[i] = new StopwatchTimer(mClocks, null, -200-i, null,















                    mOnBatteryTimeBase);















        }










@@ -10494,7 +10495,7 @@ public class BatteryStatsImpl extends BatteryStats {













        mFlashlightOnTimer.reset(false);















        mCameraOnTimer.reset(false);















        mBluetoothScanTimer.reset(false);













        for (int i=0; i<SignalStrength.NUM_SIGNAL_STRENGTH_BINS; i++) {













        for (int i = 0; i < CellSignalStrength.getNumSignalStrengthLevels(); i++) {















            mPhoneSignalStrengthsTimer[i].reset(false);















        }















        mPhoneSignalScanningTimer.reset(false);










@@ -11055,7 +11056,7 @@ public class BatteryStatsImpl extends BatteryStats {













                            mPowerProfile.getAveragePower(PowerProfile.POWER_MODEM_CONTROLLER_RX);















                    int[] txTimeMs = deltaInfo.getTxTimeMillis();















                    for (int i = 0; i < Math.min(txTimeMs.length,













                            SignalStrength.NUM_SIGNAL_STRENGTH_BINS); i++) {













                            CellSignalStrength.getNumSignalStrengthLevels()); i++) {















                        energyUsed += txTimeMs[i] * mPowerProfile.getAveragePower(















                                PowerProfile.POWER_MODEM_CONTROLLER_TX, i);















                    }










@@ -12604,7 +12605,8 @@ public class BatteryStatsImpl extends BatteryStats {













        for (int i = 0; i < timeInRatMs.length; i++) {















           timeInRatMs[i] = getPhoneDataConnectionTime(i, rawRealTime, which) / 1000;















        }













        long[] timeInRxSignalStrengthLevelMs = new long[SignalStrength.NUM_SIGNAL_STRENGTH_BINS];













        long[] timeInRxSignalStrengthLevelMs =













                new long[CellSignalStrength.getNumSignalStrengthLevels()];















        for (int i = 0; i < timeInRxSignalStrengthLevelMs.length; i++) {















           timeInRxSignalStrengthLevelMs[i]















               = getPhoneSignalStrengthTime(i, rawRealTime, which) / 1000;










@@ -13608,7 +13610,7 @@ public class BatteryStatsImpl extends BatteryStats {













        mDeviceLightIdlingTimer.readSummaryFromParcelLocked(in);















        mDeviceIdlingTimer.readSummaryFromParcelLocked(in);















        mPhoneOnTimer.readSummaryFromParcelLocked(in);













        for (int i=0; i<SignalStrength.NUM_SIGNAL_STRENGTH_BINS; i++) {













        for (int i = 0; i < CellSignalStrength.getNumSignalStrengthLevels(); i++) {















            mPhoneSignalStrengthsTimer[i].readSummaryFromParcelLocked(in);















        }















        mPhoneSignalScanningTimer.readSummaryFromParcelLocked(in);










@@ -14093,7 +14095,7 @@ public class BatteryStatsImpl extends BatteryStats {













        mDeviceLightIdlingTimer.writeSummaryFromParcelLocked(out, NOWREAL_SYS);















        mDeviceIdlingTimer.writeSummaryFromParcelLocked(out, NOWREAL_SYS);















        mPhoneOnTimer.writeSummaryFromParcelLocked(out, NOWREAL_SYS);













        for (int i=0; i<SignalStrength.NUM_SIGNAL_STRENGTH_BINS; i++) {













        for (int i = 0; i < CellSignalStrength.getNumSignalStrengthLevels(); i++) {















            mPhoneSignalStrengthsTimer[i].writeSummaryFromParcelLocked(out, NOWREAL_SYS);















        }















        mPhoneSignalScanningTimer.writeSummaryFromParcelLocked(out, NOWREAL_SYS);










@@ -14571,7 +14573,7 @@ public class BatteryStatsImpl extends BatteryStats {













                mOnBatteryTimeBase, in);















        mDeviceIdlingTimer = new StopwatchTimer(mClocks, null, -12, null, mOnBatteryTimeBase, in);















        mPhoneOnTimer = new StopwatchTimer(mClocks, null, -3, null, mOnBatteryTimeBase, in);













        for (int i=0; i<SignalStrength.NUM_SIGNAL_STRENGTH_BINS; i++) {













        for (int i = 0; i < CellSignalStrength.getNumSignalStrengthLevels(); i++) {















            mPhoneSignalStrengthsTimer[i] = new StopwatchTimer(mClocks, null, -200-i,















                    null, mOnBatteryTimeBase, in);















        }










@@ -14790,7 +14792,7 @@ public class BatteryStatsImpl extends BatteryStats {













        mDeviceLightIdlingTimer.writeToParcel(out, uSecRealtime);















        mDeviceIdlingTimer.writeToParcel(out, uSecRealtime);















        mPhoneOnTimer.writeToParcel(out, uSecRealtime);













        for (int i=0; i<SignalStrength.NUM_SIGNAL_STRENGTH_BINS; i++) {













        for (int i = 0; i < CellSignalStrength.getNumSignalStrengthLevels(); i++) {















            mPhoneSignalStrengthsTimer[i].writeToParcel(out, uSecRealtime);















        }















        mPhoneSignalScanningTimer.writeToParcel(out, uSecRealtime);










@@ -14981,7 +14983,7 @@ public class BatteryStatsImpl extends BatteryStats {













            mDeviceIdlingTimer.logState(pr, "  ");















            pr.println("*** Phone timer:");















            mPhoneOnTimer.logState(pr, "  ");













            for (int i=0; i<SignalStrength.NUM_SIGNAL_STRENGTH_BINS; i++) {













            for (int i = 0; i < CellSignalStrength.getNumSignalStrengthLevels(); i++) {















                pr.println("*** Phone signal strength #" + i + ":");















                mPhoneSignalStrengthsTimer[i].logState(pr, "  ");















            }

























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



+2
−2




























Original line number
Diff line number
Diff line








@@ -16,14 +16,14 @@













package com.android.internal.os;































import android.os.BatteryStats;













import android.telephony.SignalStrength;













import android.telephony.CellSignalStrength;















import android.util.Log;































public class MobileRadioPowerCalculator extends PowerCalculator {















    private static final String TAG = "MobileRadioPowerController";















    private static final boolean DEBUG = BatteryStatsHelper.DEBUG;















    private final double mPowerRadioOn;













    private final double[] mPowerBins = new double[SignalStrength.NUM_SIGNAL_STRENGTH_BINS];













    private final double[] mPowerBins = new double[CellSignalStrength.getNumSignalStrengthLevels()];















    private final double mPowerScan;















    private BatteryStats mStats;















    private long mTotalAppMobileActiveMs = 0;