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

Commit f75b2cb7 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

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

Change-Id: If58382b7e0c6ee79464a71786b6b40dbe1c4c970
parents 37ffd54f 6c26cb4c

telephony/java/android/telephony/ModemActivityInfo.java

+8 −6
Original line number Diff line number Diff line
@@ -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);

        }

        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