Merge "Modem power monitor"

This commit is contained in:
Blake Kragten
2019-02-13 17:21:30 +00:00
committed by Gerrit Code Review

View File

@@ -44,6 +44,7 @@ public final class CellularBatteryStats implements Parcelable {
private long[] mTimeInRatMs; private long[] mTimeInRatMs;
private long[] mTimeInRxSignalStrengthLevelMs; private long[] mTimeInRxSignalStrengthLevelMs;
private long[] mTxTimeMs; private long[] mTxTimeMs;
private long mMonitoredRailChargeConsumedMaMs;
public static final Parcelable.Creator<CellularBatteryStats> CREATOR = new public static final Parcelable.Creator<CellularBatteryStats> CREATOR = new
Parcelable.Creator<CellularBatteryStats>() { Parcelable.Creator<CellularBatteryStats>() {
@@ -74,6 +75,7 @@ public final class CellularBatteryStats implements Parcelable {
out.writeLongArray(mTimeInRatMs); out.writeLongArray(mTimeInRatMs);
out.writeLongArray(mTimeInRxSignalStrengthLevelMs); out.writeLongArray(mTimeInRxSignalStrengthLevelMs);
out.writeLongArray(mTxTimeMs); out.writeLongArray(mTxTimeMs);
out.writeLong(mMonitoredRailChargeConsumedMaMs);
} }
public void readFromParcel(Parcel in) { public void readFromParcel(Parcel in) {
@@ -90,6 +92,7 @@ public final class CellularBatteryStats implements Parcelable {
in.readLongArray(mTimeInRatMs); in.readLongArray(mTimeInRatMs);
in.readLongArray(mTimeInRxSignalStrengthLevelMs); in.readLongArray(mTimeInRxSignalStrengthLevelMs);
in.readLongArray(mTxTimeMs); in.readLongArray(mTxTimeMs);
mMonitoredRailChargeConsumedMaMs = in.readLong();
} }
public long getLoggingDurationMs() { public long getLoggingDurationMs() {
@@ -144,6 +147,10 @@ public final class CellularBatteryStats implements Parcelable {
return mTxTimeMs; return mTxTimeMs;
} }
public long getMonitoredRailChargeConsumedMaMs() {
return mMonitoredRailChargeConsumedMaMs;
}
public void setLoggingDurationMs(long t) { public void setLoggingDurationMs(long t) {
mLoggingDurationMs = t; mLoggingDurationMs = t;
return; return;
@@ -211,6 +218,11 @@ public final class CellularBatteryStats implements Parcelable {
return; return;
} }
public void setMonitoredRailChargeConsumedMaMs(long monitoredRailEnergyConsumedMaMs) {
mMonitoredRailChargeConsumedMaMs = monitoredRailEnergyConsumedMaMs;
return;
}
public int describeContents() { public int describeContents() {
return 0; return 0;
} }
@@ -237,6 +249,7 @@ public final class CellularBatteryStats implements Parcelable {
Arrays.fill(mTimeInRxSignalStrengthLevelMs, 0); Arrays.fill(mTimeInRxSignalStrengthLevelMs, 0);
mTxTimeMs = new long[ModemActivityInfo.TX_POWER_LEVELS]; mTxTimeMs = new long[ModemActivityInfo.TX_POWER_LEVELS];
Arrays.fill(mTxTimeMs, 0); Arrays.fill(mTxTimeMs, 0);
mMonitoredRailChargeConsumedMaMs = 0;
return; return;
} }
} }