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

2016-01-28 23:56:15 +00:00
parent 8a688b2f36 938dcc88fd
commit ff62707130
1 changed files with 3 additions and 1 deletions
--- a/telephony/java/android/telephony/ModemActivityInfo.java
+++ b/telephony/java/android/telephony/ModemActivityInfo.java
@@ -48,7 +48,9 @@ public class ModemActivityInfo implements Parcelable {
        mTimestamp = timestamp;
        mSleepTimeMs = sleepTimeMs;
        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;
        mEnergyUsed = energyUsed;
    }