Merge "Handle IllegalStateException from TelephonyManager." into qt-qpr1-dev (cefa4768) · Commits · e / os / android_packages_services_Telecomm

src/com/android/server/telecom/PhoneNumberUtilsAdapterImpl.java

+15 −7

Original line number	Diff line number	Diff line
		@@ -24,16 +24,24 @@ import android.telephony.TelephonyManager;
		public class PhoneNumberUtilsAdapterImpl implements PhoneNumberUtilsAdapter {
		@Override
		public boolean isLocalEmergencyNumber(Context context, String number) {
		try {
		TelephonyManager tm = (TelephonyManager) context.getSystemService(
		Context.TELEPHONY_SERVICE);
		return tm.isEmergencyNumber(number);
		} catch (IllegalStateException ise) {
		return false;
		}
		}

		@Override
		public boolean isPotentialLocalEmergencyNumber(Context context, String number) {
		try {
		TelephonyManager tm = (TelephonyManager) context.getSystemService(
		Context.TELEPHONY_SERVICE);
		return tm.isPotentialEmergencyNumber(number);
		} catch (IllegalStateException ise) {
		return false;
		}
		}

		@Override

+7 −3

Original line number	Diff line number	Diff line
		@@ -70,8 +70,12 @@ public final class TelephonyUtil {
		}

		public static boolean shouldProcessAsEmergency(Context context, Uri handle) {
		try {
		TelephonyManager tm = (TelephonyManager) context.getSystemService(
		Context.TELEPHONY_SERVICE);
		return handle != null && tm.isEmergencyNumber(handle.getSchemeSpecificPart());
		} catch (IllegalStateException ise) {
		return false;
		}
		}
		}