commit 938dcc88fd19425db4fc604c69a022760738028b
author Amit Mahajan <amitmahajan@google.com> Thu Jan 28 15:30:39 2016 -0800
committer Amit Mahajan <amitmahajan@google.com> Thu Jan 28 15:30:39 2016 -0800
tree 3ece5d05834adf61389403e44f1b7e5348641653
parent 24c5e7c4ceb31c85868fe2c03e8a507e2cb0520f

Add a null check before accessing int[] parameter in ModemActivityInfo

Bug: 26842468
Change-Id: I3a5f7c8e454e7b9ace20f8082ee3fd1d0a24eb64

telephony/java/android/telephony/ModemActivityInfo.java

diff --git a/telephony/java/android/telephony/ModemActivityInfo.java b/telephony/java/android/telephony/ModemActivityInfo.java
index ea96e7c..6425744 100644
--- a/telephony/java/android/telephony/ModemActivityInfo.java
+++ b/telephony/java/android/telephony/ModemActivityInfo.java
@@ -48,7 +48,9 @@
         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;
     }