diff options
| author | Vineeta Srivastava <vsrivastava@google.com> | 2015-10-28 17:06:16 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-10-28 17:06:16 +0000 |
| commit | 91a47f416f3135223e69b2b4d0c8c6b8e92cd36b (patch) | |
| tree | 50c263191d9b0bd9a23aac0d15efe1061d7ef1f5 | |
| parent | 5bb5a8e73f4ff2cca480cec3d296b4ccf254580e (diff) | |
| parent | 30c5eb9807510ff568b24b68912b200bfd2c1c39 (diff) | |
| download | telephony-marshmallow-mr1-dev.tar.gz | |
Merge "Change gid-matching process" into mnc-dr-devmarshmallow-mr1-dev
| -rw-r--r-- | src/java/com/android/internal/telephony/PhoneBase.java | 10 | ||||
| -rw-r--r-- | src/java/com/android/internal/telephony/cdma/CDMAPhone.java | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | src/java/com/android/internal/telephony/gsm/GSMPhone.java | 4 |
3 files changed, 13 insertions, 3 deletions
diff --git a/src/java/com/android/internal/telephony/PhoneBase.java b/src/java/com/android/internal/telephony/PhoneBase.java index 16a184335f..9064926e4d 100644 --- a/src/java/com/android/internal/telephony/PhoneBase.java +++ b/src/java/com/android/internal/telephony/PhoneBase.java @@ -2595,6 +2595,16 @@ public abstract class PhoneBase extends Handler implements Phone { return getLocaleFromCarrierProperties(mContext); } + protected boolean isMatchGid(String gid) { + String gid1 = getGroupIdLevel1(); + int gidLength = gid.length(); + if (!TextUtils.isEmpty(gid1) && (gid1.length() >= gidLength) + && gid1.substring(0, gidLength).equalsIgnoreCase(gid)) { + return true; + } + return false; + } + public void dump(FileDescriptor fd, PrintWriter pw, String[] args) { pw.println("PhoneBase: subId=" + getSubId()); pw.println(" mPhoneId=" + mPhoneId); diff --git a/src/java/com/android/internal/telephony/cdma/CDMAPhone.java b/src/java/com/android/internal/telephony/cdma/CDMAPhone.java index 7501f05e17..f8a3c7b337 100644 --- a/src/java/com/android/internal/telephony/cdma/CDMAPhone.java +++ b/src/java/com/android/internal/telephony/cdma/CDMAPhone.java @@ -959,7 +959,7 @@ public class CDMAPhone extends PhoneBase { number = defaultVMNumberArray[0]; } else if (defaultVMNumberArray.length == 2 && !TextUtils.isEmpty(defaultVMNumberArray[1]) && - defaultVMNumberArray[1].equalsIgnoreCase(getGroupIdLevel1())) { + isMatchGid(defaultVMNumberArray[1])) { number = defaultVMNumberArray[0]; break; } diff --git a/src/java/com/android/internal/telephony/gsm/GSMPhone.java b/src/java/com/android/internal/telephony/gsm/GSMPhone.java index 3174b90f23..5520f017da 100755..100644 --- a/src/java/com/android/internal/telephony/gsm/GSMPhone.java +++ b/src/java/com/android/internal/telephony/gsm/GSMPhone.java @@ -988,7 +988,7 @@ public class GSMPhone extends PhoneBase { number = defaultVMNumberArray[0]; } else if (defaultVMNumberArray.length == 2 && !TextUtils.isEmpty(defaultVMNumberArray[1]) && - defaultVMNumberArray[1].equalsIgnoreCase(getGroupIdLevel1())) { + isMatchGid(defaultVMNumberArray[1])) { number = defaultVMNumberArray[0]; break; } @@ -1858,7 +1858,7 @@ public class GSMPhone extends PhoneBase { ((configArray.length == 1 && configArray[0].equalsIgnoreCase("true")) || (configArray.length == 2 && !TextUtils.isEmpty(configArray[1]) && configArray[0].equalsIgnoreCase("true") && - configArray[1].equalsIgnoreCase(getGroupIdLevel1())))) { + isMatchGid(configArray[1])))) { isProhibited = true; } } |