Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Allow 15 strings in RIL_REQUEST_VOICE_REGISTRATION_STATE response"

Browse Source
This commit is contained in:
Wink Saville
2011-08-26 10:33:15 -07:00
committed by Android (Google) Code Review
parent fdfbbf62e6 dc69a6b146
commit d0b6ad9ec9
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
telephony/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
View File

@@ -545,7 +545,7 @@ public class CdmaServiceStateTracker extends ServiceStateTracker {
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 @@ public class CdmaServiceStateTracker extends ServiceStateTracker {
}
} 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;