Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 91a47f41 authored Oct 28, 2015 by Vineeta Srivastava Committed by Android (Google) Code Review Oct 28, 2015

Merge "Change gid-matching process" into mnc-dr-dev

parents 5bb5a8e7 30c5eb98

src/java/com/android/internal/telephony/PhoneBase.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -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);

src/java/com/android/internal/telephony/cdma/CDMAPhone.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}

src/java/com/android/internal/telephony/gsm/GSMPhone.java

100755 → 100644

+2 −2

Original line number	Diff line number	Diff line
		@@ -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;
		}
		}