commit d0b6ad9ec925bdc5b9ff4d125e76b32ab69c1563
author Wink Saville <wink@google.com> Fri Aug 26 10:33:15 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Aug 26 10:33:15 2011 -0700
tree 19562de97bdc4f3b1ac37409565d88b7246e1e25
parent fdfbbf62e61020b6b6170862eaabd72b43bca4ea
parent dc69a6b146f59092e8aa251c63a973e7471babf2

Merge "Allow 15 strings in RIL_REQUEST_VOICE_REGISTRATION_STATE response"

telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java

diff --git a/telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java b/telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
index 2cf4b88..0aed77e 100755
--- a/telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
+++ b/telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
@@ -545,7 +545,7 @@
             int defaultRoamingIndicator = 0;  //[12] Is default roaming indicator from PRL
             int reasonForDenial = 0;       //[13] Denial reason if registrationState = 3
 
-            if (states.length == 14) {
+            if (states.length >= 14) {
                 try {
                     if (states[0] != null) {
                         registrationState = Integer.parseInt(states[0]);
@@ -593,8 +593,8 @@
                 }
             } else {
                 throw new RuntimeException("Warning! Wrong number of parameters returned from "
-                                     + "RIL_REQUEST_REGISTRATION_STATE: expected 14 got "
-                                     + states.length);
+                                     + "RIL_REQUEST_REGISTRATION_STATE: expected 14 or more "
+                                     + "strings and got " + states.length + " strings");
             }
 
             mRegistrationState = registrationState;