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

Commit 75239584 authored by Taesu Lee's avatar Taesu Lee Committed by Shuo Qian
Browse files

Use TelephonyManager#isEmergencyNumber() instead 



Replace deprecated PhoneNumberUtils#isLocalEmergencyNumber() and
isEmergencyNumber() with TelephonyManager#isEmergencyNumber().

Test: atest FrameworksTelephonyTests
Bug: 132703886
Change-Id: Ib79624226b1990eaed2d26d964b32bc5018e61c2
Signed-off-by: default avatarTaesu Lee <taesu82.lee@samsung.com>
Merged-In: Ib79624226b1990eaed2d26d964b32bc5018e61c2
parent f54703d1

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

+0 −5
Original line number Diff line number Diff line
@@ -813,9 +813,6 @@ public class CallManager { 
            }

        }



        // FIXME Taken from klp-sprout-dev but setAudioMode was removed in L.

        //mIsEccDialing = PhoneNumberUtils.isEmergencyNumber(dialString);



        result = phone.dial(dialString, new PhoneInternalInterface.DialArgs.Builder<>()

                .setVideoState(videoState).build());
@@ -2076,8 +2073,6 @@ public class CallManager { 
                case EVENT_DISCONNECT:

                    if (VDBG) Rlog.d(LOG_TAG, " handleMessage (EVENT_DISCONNECT)");

                    mDisconnectRegistrants.notifyRegistrants((AsyncResult) msg.obj);

                    // FIXME Taken from klp-sprout-dev but setAudioMode was removed in L.

                    //mIsEccDialing = false;

                    break;

                case EVENT_PRECISE_CALL_STATE_CHANGED:

                    if (VDBG) Rlog.d(LOG_TAG, " handleMessage (EVENT_PRECISE_CALL_STATE_CHANGED)");

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

+9 −7
Original line number Diff line number Diff line
@@ -281,8 +281,9 @@ public class GsmCdmaCallTracker extends CallTracker { 
        clearDisconnected();



        // Check for issues which would preclude dialing and throw a CallStateException.

        boolean isEmergencyCall = PhoneNumberUtils.isLocalEmergencyNumber(mPhone.getContext(),

                dialString);

        TelephonyManager tm =

                (TelephonyManager) mPhone.getContext().getSystemService(Context.TELEPHONY_SERVICE);

        boolean isEmergencyCall = tm.isEmergencyNumber(dialString);

        checkForDialIssues(isEmergencyCall);



        String origNumber = dialString;
@@ -374,7 +375,9 @@ public class GsmCdmaCallTracker extends CallTracker { 
     */

    @UnsupportedAppUsage

    private void disableDataCallInEmergencyCall(String dialString) {

        if (PhoneNumberUtils.isLocalEmergencyNumber(mPhone.getContext(), dialString)) {

        TelephonyManager tm =

                (TelephonyManager) mPhone.getContext().getSystemService(Context.TELEPHONY_SERVICE);

        if (tm.isEmergencyNumber(dialString)) {

            if (Phone.DEBUG_PHONE) log("disableDataCallInEmergencyCall");

            setIsInEmergencyCall();

        }
@@ -397,14 +400,13 @@ public class GsmCdmaCallTracker extends CallTracker { 
        // note that this triggers call state changed notif

        clearDisconnected();



        boolean isEmergencyCall =

                PhoneNumberUtils.isLocalEmergencyNumber(mPhone.getContext(), dialString);

        TelephonyManager tm =

                (TelephonyManager) mPhone.getContext().getSystemService(Context.TELEPHONY_SERVICE);

        boolean isEmergencyCall = tm.isEmergencyNumber(dialString);



        // Check for issues which would preclude dialing and throw a CallStateException.

        checkForDialIssues(isEmergencyCall);



        TelephonyManager tm =

                (TelephonyManager) mPhone.getContext().getSystemService(Context.TELEPHONY_SERVICE);

        String origNumber = dialString;

        String operatorIsoContry = tm.getNetworkCountryIso(mPhone.getPhoneId());

        String simIsoContry = tm.getSimCountryIsoForPhone(mPhone.getPhoneId());

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

+4 −2
Original line number Diff line number Diff line
@@ -1271,7 +1271,8 @@ public class GsmCdmaPhone extends Phone { 
                    + possibleEmergencyNumber);

            dialString = possibleEmergencyNumber;

        }

        boolean isEmergency = PhoneNumberUtils.isEmergencyNumber(getSubId(), dialString);

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

        boolean isEmergency = tm.isEmergencyNumber(dialString);

        Phone imsPhone = mImsPhone;

        mDialArgs = dialArgs;
@@ -1414,7 +1415,8 @@ public class GsmCdmaPhone extends Phone { 
        }



        Phone imsPhone = mImsPhone;

        boolean isEmergency = PhoneNumberUtils.isEmergencyNumber(getSubId(), dialString);

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

        boolean isEmergency = tm.isEmergencyNumber(dialString);

        boolean shouldConfirmCall =

                        // Using IMS

                        isImsUseEnabled()

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

+3 −4
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import android.os.PersistableBundle; 
import android.os.RemoteException;

import android.provider.Telephony.Sms.Intents;

import android.telephony.CarrierConfigManager;

import android.telephony.PhoneNumberUtils;

import android.telephony.ServiceState;

import android.telephony.ims.ImsReasonInfo;

import android.telephony.ims.RegistrationManager;
@@ -316,14 +315,14 @@ public class ImsSmsDispatcher extends SMSDispatcher { 
    public boolean isEmergencySmsSupport(String destAddr) {

        PersistableBundle b;

        boolean eSmsCarrierSupport = false;

        if (!PhoneNumberUtils.isLocalEmergencyNumber(mContext, mPhone.getSubId(), destAddr)) {

            loge("Emergency Sms is not supported for: " + Rlog.pii(TAG, destAddr));

        if (!mTelephonyManager.isEmergencyNumber(destAddr)) {

            logi(Rlog.pii(TAG, destAddr) + " is not emergency number");

            return false;

        }



        final long identity = Binder.clearCallingIdentity();

        try {

            CarrierConfigManager configManager = (CarrierConfigManager) mPhone.getContext()

            CarrierConfigManager configManager = (CarrierConfigManager) mContext

                    .getSystemService(Context.CARRIER_CONFIG_SERVICE);

            if (configManager == null) {

                loge("configManager is null");

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

+1 −1
Original line number Diff line number Diff line
@@ -1333,7 +1333,7 @@ public abstract class SMSDispatcher extends Handler { 
            }

        }



        if (PhoneNumberUtils.isLocalEmergencyNumber(mContext, trackers[0].mDestAddress)) {

        if (mTelephonyManager.isEmergencyNumber(trackers[0].mDestAddress)) {

            new AsyncEmergencyContactNotifier(mContext).execute();

        }

    }