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

Commit dbb7d13a authored by Amit Mahajan's avatar Amit Mahajan Committed by android-build-merger
Browse files

Merge "Add a null check before accessing int[] parameter in ModemActivityInfo" into mm-wireless-dev 

am: ff627071

* commit 'ff627071':
  Add a null check before accessing int[] parameter in ModemActivityInfo
parents ad2a71f7 ff627071

telephony/java/android/telephony/ModemActivityInfo.java

+3 −1
Original line number Diff line number Diff line
@@ -48,7 +48,9 @@ public class ModemActivityInfo implements Parcelable { 
        mTimestamp = timestamp;

        mSleepTimeMs = sleepTimeMs;

        mIdleTimeMs = idleTimeMs;

        if (txTimeMs != null) {

            System.arraycopy(txTimeMs, 0, mTxTimeMs, 0, Math.min(txTimeMs.length, TX_POWER_LEVELS));

        }

        mRxTimeMs = rxTimeMs;

        mEnergyUsed = energyUsed;

    }