diff options
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/os/BatteryStats.java | 14 | ||||
| -rw-r--r-- | core/java/android/os/connectivity/CellularBatteryStats.java | 6 |
2 files changed, 10 insertions, 10 deletions
diff --git a/core/java/android/os/BatteryStats.java b/core/java/android/os/BatteryStats.java index 95815e48016d..9fed26916899 100644 --- a/core/java/android/os/BatteryStats.java +++ b/core/java/android/os/BatteryStats.java @@ -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; @@ -2529,7 +2529,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", @@ -3891,14 +3891,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); @@ -4968,7 +4968,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); @@ -8216,7 +8216,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), diff --git a/core/java/android/os/connectivity/CellularBatteryStats.java b/core/java/android/os/connectivity/CellularBatteryStats.java index caa406899161..b8c180221ca2 100644 --- a/core/java/android/os/connectivity/CellularBatteryStats.java +++ b/core/java/android/os/connectivity/CellularBatteryStats.java @@ -22,8 +22,8 @@ import android.os.BatteryStats; import android.os.Parcel; import android.os.Parcelable; import android.telephony.Annotation.NetworkType; +import android.telephony.CellSignalStrength; import android.telephony.ModemActivityInfo; -import android.telephony.SignalStrength; import java.util.Arrays; import java.util.Objects; @@ -48,7 +48,7 @@ public final class CellularBatteryStats implements Parcelable { private long mEnergyConsumedMaMs = 0; private long[] mTimeInRatMs = new long[BatteryStats.NUM_DATA_CONNECTION_TYPES]; private long[] mTimeInRxSignalStrengthLevelMs = - new long[SignalStrength.NUM_SIGNAL_STRENGTH_BINS]; + new long[CellSignalStrength.getNumSignalStrengthLevels()]; private long[] mTxTimeMs = new long[ModemActivityInfo.TX_POWER_LEVELS]; private long mMonitoredRailChargeConsumedMaMs = 0; @@ -354,7 +354,7 @@ public final class CellularBatteryStats implements Parcelable { /** @hide **/ public void setTimeInRxSignalStrengthLevelMicros(@NonNull long[] t) { mTimeInRxSignalStrengthLevelMs = Arrays.copyOfRange(t, 0, - Math.min(t.length, SignalStrength.NUM_SIGNAL_STRENGTH_BINS)); + Math.min(t.length, CellSignalStrength.getNumSignalStrengthLevels())); return; } |