summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/java/com/android/internal/telephony/SamsungQualcommRIL.java30
1 files changed, 16 insertions, 14 deletions
diff --git a/src/java/com/android/internal/telephony/SamsungQualcommRIL.java b/src/java/com/android/internal/telephony/SamsungQualcommRIL.java
index 49e369c..e3c0d40 100644
--- a/src/java/com/android/internal/telephony/SamsungQualcommRIL.java
+++ b/src/java/com/android/internal/telephony/SamsungQualcommRIL.java
@@ -503,22 +503,24 @@ public class SamsungQualcommRIL extends RIL implements CommandsInterface {
operatorCheck(Parcel p) {
String response[] = (String[])responseStrings(p);
for(int i=0; i<response.length; i++){
- if (response[i]!= null&&i<2){
- if (response[i].equals(" Empty") || (response[i].equals("") && !isGSM)) {
- response[i]=operator;
- } else if (!response[i].equals("")) {
- try {
- Integer.parseInt(response[i]);
- response[i]=Operators.operatorReplace(response[i]);
- //optimize
- if(i==0)
- response[i+1]=response[i];
- } catch(NumberFormatException E){
- // do nothing
+ if (response[i]!= null){
+ if (i<2){
+ if (response[i].equals(" Empty") || (response[i].equals("") && !isGSM)) {
+ response[i]=operator;
+ } else if (!response[i].equals("")) {
+ try {
+ Integer.parseInt(response[i]);
+ response[i]=Operators.operatorReplace(response[i]);
+ //optimize
+ if(i==0)
+ response[i+1]=response[i];
+ } catch(NumberFormatException E){
+ // do nothing
+ }
}
+ } else if (response[i].equals("31000")|| response[i].equals("11111") || response[i].equals("123456") || response[i].equals("31099") || (response[i].equals("") && !isGSM)){
+ response[i]=homeOperator;
}
- } else if (response[i].equals("31000")|| response[i].equals("11111") || response[i].equals("123456") || response[i].equals("31099") || (response[i].equals("") && !isGSM)){
- response[i]=homeOperator;
}
}
return response;