commit f5d29555b53457e8172552dbb0228bf178bbd4a8
author Siddharth Ray <siddharthr@google.com> Sun Jun 17 15:02:38 2018 -0700
committer Siddharth Ray <siddharthr@google.com> Sun Jun 24 21:55:40 2018 +0000
tree 75606c545eea74893790fc4b16342aaa607205d1
parent 068670def068be918b64f6a6ea7df797c3959208

Fix in Modem Activity Info updates

A check is added to capture the following error conditions:
- Idle time is larger than the total activity duration.
- Sleep time is larger than the total activity duration.
- Rx time is larger than the total activity duration.
- Total Tx time is larger than the total activity duration.

BUG:110319204
Change-Id: I47b18313c0d0e336110859bd79da2347862bbfde
Merged-In: I47b18313c0d0e336110859bd79da2347862bbfde

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index ae3ec4e..101ab44 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -3683,7 +3683,7 @@
         synchronized (mLastModemActivityInfo) {
             ModemActivityInfo info = (ModemActivityInfo) sendRequest(CMD_GET_MODEM_ACTIVITY_INFO,
                     null);
-            if (info != null) {
+            if (isModemActivityInfoValid(info)) {
                 int[] mergedTxTimeMs = new int[ModemActivityInfo.TX_POWER_LEVELS];
                 for (int i = 0; i < mergedTxTimeMs.length; i++) {
                     mergedTxTimeMs[i] =
@@ -3712,6 +3712,25 @@
         result.send(0, bundle);
     }
 
+    // Checks that ModemActivityInfo is valid. Sleep time, Idle time, Rx time and Tx time should be
+    // less than total activity duration.
+    private boolean isModemActivityInfoValid(ModemActivityInfo info) {
+        if (info == null) {
+            return false;
+        }
+        int activityDurationMs =
+            (int) (info.getTimestamp() - mLastModemActivityInfo.getTimestamp());
+        int totalTxTimeMs = 0;
+        for (int i = 0; i < info.getTxTimeMillis().length; i++) {
+            totalTxTimeMs += info.getTxTimeMillis()[i];
+        }
+        return (info.isValid()
+            && (info.getSleepTimeMillis() <= activityDurationMs)
+            && (info.getIdleTimeMillis() <= activityDurationMs)
+            && (info.getRxTimeMillis() <= activityDurationMs)
+            && (totalTxTimeMs <= activityDurationMs));
+    }
+
     /**
      * {@hide}
      * Returns the service state information on specified subscription.