commit fa3049fdfac244c12bd3d8d6f53a16155e2b3b1d
author Jack Yu <jackyu@google.com> Wed Mar 22 20:52:36 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Mar 22 20:52:38 2017 +0000
tree 432aebbfc4609f9d5d4edcfddbe7c635ea344397
parent 2328077d0bea9ad9cbc68f1d6dd1ca3bb9c559aa
parent 7f8c8fbebb39e4530dfb6eea39850c8b228982d7

Merge "Invalid call forwarding indicator status check"

src/java/com/android/internal/telephony/uicc/SIMRecords.java

diff --git a/src/java/com/android/internal/telephony/uicc/SIMRecords.java b/src/java/com/android/internal/telephony/uicc/SIMRecords.java
index 9be0aaf..c114e9f 100755
--- a/src/java/com/android/internal/telephony/uicc/SIMRecords.java
+++ b/src/java/com/android/internal/telephony/uicc/SIMRecords.java
@@ -501,10 +501,17 @@
         }
     }
 
-    // Validate data is !null and the MSP (Multiple Subscriber Profile)
-    // byte is between 1 and 4. See ETSI TS 131 102 v11.3.0 section 4.2.64.
+    // Validate data is !null.
     private boolean validEfCfis(byte[] data) {
-        return ((data != null) && (data[0] >= 1) && (data[0] <= 4));
+        if (data != null) {
+            if (data[0] < 1 || data[0] > 4) {
+                // The MSP (Multiple Subscriber Profile) byte should be between
+                // 1 and 4 according to ETSI TS 131 102 v11.3.0 section 4.2.64.
+                logw("MSP byte: " + data[0] + " is not between 1 and 4", null);
+            }
+            return true;
+        }
+        return false;
     }
 
     public int getVoiceMessageCount() {