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

Merge "Make sure mTransmitPowerInfo is always populated" am: 6c26cb4ca2

Browse Source 
Change-Id: If58382b7e0c6ee79464a71786b6b40dbe1c4c970
This commit is contained in:
Automerger Merge Worker
2020-03-09 20:09:02 +00:00
parent 37ffd54f58 6c26cb4ca2
commit f75b2cb730
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.os.Parcel;
import android.os.Parcelable;
import android.os.SystemClock;
import android.util.Range;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
/**
@@ -64,17 +63,20 @@ public final class ModemActivityInfo implements Parcelable {
mTimestamp = timestamp;
mSleepTimeMs = sleepTimeMs;
mIdleTimeMs = idleTimeMs;
if (txTimeMs != null) {
populateTransmitPowerRange(txTimeMs);
}
populateTransmitPowerRange(txTimeMs);
mRxTimeMs = rxTimeMs;
}
/** helper API to populate tx power range for each bucket **/
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]));
}
// Make sure that mTransmitPowerInfo is fully initialized.
for ( ; i < TX_POWER_LEVELS; i++) {
mTransmitPowerInfo.add(i, new TransmitPower(TX_POWER_RANGES[i], 0));
}
}
@Override