Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make sure mTransmitPowerInfo is always populated"

Browse Source
This commit is contained in:
Daniel Bright
2020-03-09 19:58:28 +00:00
committed by Gerrit Code Review
parent 7d8f1a768a 085e772609
commit 6c26cb4ca2
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
telephony/java/android/telephony/ModemActivityInfo.java
View File

@@ -20,11 +20,10 @@ import android.annotation.NonNull;
import android.annotation.SystemApi; import android.annotation.SystemApi;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
import android.os.SystemClock; import android.os.SystemClock;
import android.util.Range; import android.util.Range;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.List; import java.util.List;
/** /**
@@ -64,17 +63,20 @@ public final class ModemActivityInfo implements Parcelable {
mTimestamp = timestamp; mTimestamp = timestamp;
mSleepTimeMs = sleepTimeMs; mSleepTimeMs = sleepTimeMs;
mIdleTimeMs = idleTimeMs; mIdleTimeMs = idleTimeMs;
if (txTimeMs != null) { populateTransmitPowerRange(txTimeMs);
populateTransmitPowerRange(txTimeMs);
}
mRxTimeMs = rxTimeMs; mRxTimeMs = rxTimeMs;
} }
/** helper API to populate tx power range for each bucket **/ /** helper API to populate tx power range for each bucket **/
private void populateTransmitPowerRange(@NonNull int[] transmitPowerMs) { private void populateTransmitPowerRange(@NonNull int[] transmitPowerMs) {
for (int i = 0; i < Math.min(transmitPowerMs.length, TX_POWER_LEVELS); i++) { int i = 0;
for ( ; i < Math.min(transmitPowerMs.length, TX_POWER_LEVELS); i++) {
mTransmitPowerInfo.add(i, new TransmitPower(TX_POWER_RANGES[i], transmitPowerMs[i])); mTransmitPowerInfo.add(i, new TransmitPower(TX_POWER_RANGES[i], transmitPowerMs[i]));
} }
// Make sure that mTransmitPowerInfo is fully initialized.
for ( ; i < TX_POWER_LEVELS; i++) {
mTransmitPowerInfo.add(i, new TransmitPower(TX_POWER_RANGES[i], 0));
}
} }
@Override @Override