Merge "Strip emergency number format and check prefix in ecclist" am: ba91c956e7 am: ee153c8c2b (8789c631) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/emergency/EmergencyNumberTracker.java

+51 −2

Original line number	Diff line number	Diff line
		@@ -455,6 +455,7 @@ public class EmergencyNumberTracker extends Handler {
		if (number == null) {
		return false;
		}
		number = PhoneNumberUtils.stripSeparators(number);
		if (!mEmergencyNumberListFromRadio.isEmpty()) {
		for (EmergencyNumber num : mEmergencyNumberList) {
		// According to com.android.i18n.phonenumbers.ShortNumberInfo, in
		@@ -490,6 +491,7 @@ public class EmergencyNumberTracker extends Handler {
		* @return the {@link EmergencyNumber} for the corresponding emergency number address.
		*/
		public EmergencyNumber getEmergencyNumber(String emergencyNumber) {
		emergencyNumber = PhoneNumberUtils.stripSeparators(emergencyNumber);
		for (EmergencyNumber num : getEmergencyNumberList()) {
		if (num.getNumber().equals(emergencyNumber)) {
		return num;
		@@ -508,6 +510,7 @@ public class EmergencyNumberTracker extends Handler {
		* @return the emergency service categories for the corresponding emergency number.
		*/
		public @EmergencyServiceCategories int getEmergencyServiceCategories(String emergencyNumber) {
		emergencyNumber = PhoneNumberUtils.stripSeparators(emergencyNumber);
		for (EmergencyNumber num : getEmergencyNumberList()) {
		if (num.getNumber().equals(emergencyNumber)) {
		if (num.isFromSources(EmergencyNumber.EMERGENCY_NUMBER_SOURCE_NETWORK_SIGNALING)
		@@ -527,6 +530,7 @@ public class EmergencyNumberTracker extends Handler {
		* @return the emergency call routing for the corresponding emergency number.
		*/
		public @EmergencyCallRouting int getEmergencyCallRouting(String emergencyNumber) {
		emergencyNumber = PhoneNumberUtils.stripSeparators(emergencyNumber);
		for (EmergencyNumber num : getEmergencyNumberList()) {
		if (num.getNumber().equals(emergencyNumber)) {
		if (num.isFromSources(EmergencyNumber.EMERGENCY_NUMBER_SOURCE_DATABASE)) {
		@@ -589,6 +593,7 @@ public class EmergencyNumberTracker extends Handler {
		}

		private boolean isEmergencyNumberForTest(String number) {
		number = PhoneNumberUtils.stripSeparators(number);
		for (EmergencyNumber num : mEmergencyNumberListFromTestMode) {
		if (num.getNumber().equals(number)) {
		return true;
		@@ -598,6 +603,7 @@ public class EmergencyNumberTracker extends Handler {
		}

		private EmergencyNumber getLabeledEmergencyNumberForEcclist(String number) {
		number = PhoneNumberUtils.stripSeparators(number);
		for (EmergencyNumber num : mEmergencyNumberListFromDatabase) {
		if (num.getNumber().equals(number)) {
		return new EmergencyNumber(number, mCountryIso.toLowerCase(), "",
		@@ -661,10 +667,22 @@ public class EmergencyNumberTracker extends Handler {
		if (useExactMatch \|\| "br".equalsIgnoreCase(mCountryIso)) {
		if (number.equals(emergencyNum)) {
		return true;
		} else {
		for (String prefix : mEmergencyNumberPrefix) {
		if (number.equals(prefix + emergencyNum)) {
		return true;
		}
		}
		}
		} else {
		if (number.startsWith(emergencyNum)) {
		return true;
		} else {
		for (String prefix : mEmergencyNumberPrefix) {
		if (number.equals(prefix + emergencyNum)) {
		return true;
		}
		}
		}
		}
		}
		@@ -684,10 +702,22 @@ public class EmergencyNumberTracker extends Handler {
		if (useExactMatch) {
		if (number.equals(emergencyNum)) {
		return true;
		} else {
		for (String prefix : mEmergencyNumberPrefix) {
		if (number.equals(prefix + emergencyNum)) {
		return true;
		}
		}
		}
		} else {
		if (number.startsWith(emergencyNum)) {
		return true;
		} else {
		for (String prefix : mEmergencyNumberPrefix) {
		if (number.equals(prefix + emergencyNum)) {
		return true;
		}
		}
		}
		}
		}
		@@ -696,9 +726,28 @@ public class EmergencyNumberTracker extends Handler {
		if (mCountryIso != null) {
		ShortNumberInfo info = ShortNumberInfo.getInstance();
		if (useExactMatch) {
		return info.isEmergencyNumber(number, mCountryIso.toUpperCase());
		if (info.isEmergencyNumber(number, mCountryIso.toUpperCase())) {
		return true;
		} else {
		for (String prefix : mEmergencyNumberPrefix) {
		if (info.isEmergencyNumber(prefix + number, mCountryIso.toUpperCase())) {
		return true;
		}
		}
		}
		return false;
		} else {
		if (info.connectsToEmergencyNumber(number, mCountryIso.toUpperCase())) {
		return true;
		} else {
		return info.connectsToEmergencyNumber(number, mCountryIso.toUpperCase());
		for (String prefix : mEmergencyNumberPrefix) {
		if (info.connectsToEmergencyNumber(prefix + number,
		mCountryIso.toUpperCase())) {
		return true;
		}
		}
		}
		return false;
		}
		}