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

Commit f50a479c authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert "Use TelephonyManager#isEmergencyNumber() instead"" am: 99557526 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1702033

Change-Id: I46696e7cf602b69baaa0827e4f56e71dc1beea62
parents 2a42aa89 99557526

location/java/com/android/internal/location/GpsNetInitiatedHandler.java

+2 −1
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import android.location.LocationManager; 
import android.os.RemoteException;

import android.os.SystemClock;

import android.os.UserHandle;

import android.telephony.PhoneNumberUtils;

import android.telephony.PhoneStateListener;

import android.telephony.TelephonyManager;

import android.util.Log;
@@ -160,7 +161,7 @@ public class GpsNetInitiatedHandler { 
                       be set to true when the phone is having emergency call, and then will

                       be set to false by mPhoneStateListener when the emergency call ends.

                */

                mIsInEmergencyCall = mTelephonyManager.isEmergencyNumber(phoneNumber);

                mIsInEmergencyCall = PhoneNumberUtils.isEmergencyNumber(phoneNumber);

                if (DEBUG) Log.v(TAG, "ACTION_NEW_OUTGOING_CALL - " + getInEmergency());

            } else if (action.equals(LocationManager.MODE_CHANGED_ACTION)) {

                updateLocationMode();

telecomm/java/android/telecom/CallerInfo.java

+1 −2
Original line number Diff line number Diff line
@@ -406,8 +406,7 @@ public class CallerInfo { 
        // Change the callerInfo number ONLY if it is an emergency number

        // or if it is the voicemail number.  If it is either, take a

        // shortcut and skip the query.

        TelephonyManager tm = context.getSystemService(TelephonyManager.class);

        if (tm.isEmergencyNumber(number)) {

        if (PhoneNumberUtils.isLocalEmergencyNumber(context, number)) {

            return new CallerInfo().markAsEmergency(context);

        } else if (PhoneNumberUtils.isVoiceMailNumber(null, subId, number)) {

            return new CallerInfo().markAsVoiceMail(context, subId);

telecomm/java/android/telecom/CallerInfoAsyncQuery.java

+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;