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

Commit f3dc01bf authored by Shuo Qian's avatar Shuo Qian Committed by Android (Google) Code Review
Browse files

Merge "Handles Telephony service not up fatal exception in CallerInfoAsyncQuery" into sc-dev

parents 8c62b2ba 839508ee
Loading
Loading
Loading
Loading
+10 −1
Original line number Diff line number Diff line
@@ -483,7 +483,16 @@ public class CallerInfoAsyncQuery {

        // check to see if these are recognized numbers, and use shortcuts if we can.
        TelephonyManager tm = context.getSystemService(TelephonyManager.class);
        if (tm.isEmergencyNumber(number)) {
        boolean isEmergencyNumber = false;
        try {
            isEmergencyNumber = tm.isEmergencyNumber(number);
        } catch (IllegalStateException ise) {
            // Ignore the exception that Telephony is not up. Use PhoneNumberUtils API now.
            // Ideally the PhoneNumberUtils API needs to be removed once the
            // telphony service not up issue can be fixed (b/187412989)
            isEmergencyNumber = PhoneNumberUtils.isLocalEmergencyNumber(context, number);
        }
        if (isEmergencyNumber) {
            cw.event = EVENT_EMERGENCY_NUMBER;
        } else if (PhoneNumberUtils.isVoiceMailNumber(context, subId, number)) {
            cw.event = EVENT_VOICEMAIL_NUMBER;