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

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

Browse Source
This commit is contained in:
Amit Mahajan
2016-01-28 23:56:15 +00:00
committed by Android Partner Code Review
parent 8a688b2f36 938dcc88fd
commit ff62707130
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,7 +48,9 @@ public class ModemActivityInfo implements Parcelable {
mTimestamp = timestamp; mTimestamp = timestamp;
mSleepTimeMs = sleepTimeMs; mSleepTimeMs = sleepTimeMs;
mIdleTimeMs = idleTimeMs; mIdleTimeMs = idleTimeMs;
System.arraycopy(txTimeMs, 0, mTxTimeMs, 0, Math.min(txTimeMs.length, TX_POWER_LEVELS)); if (txTimeMs != null) {
System.arraycopy(txTimeMs, 0, mTxTimeMs, 0, Math.min(txTimeMs.length, TX_POWER_LEVELS));
}
mRxTimeMs = rxTimeMs; mRxTimeMs = rxTimeMs;
mEnergyUsed = energyUsed; mEnergyUsed = energyUsed;
} }