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

Commit ad18a060 authored by Brad Ebinger's avatar Brad Ebinger Committed by Automerger Merge Worker
Browse files

Merge "Allow VoLTE retry if IMS is available for emergency" am: 602ba8a4 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1459983

Change-Id: Ie9e6585b1561ad9281af6e9115cab8bc67c5d0a9
parents d8754a48 602ba8a4

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

+1 −1
Original line number Diff line number Diff line
@@ -1562,7 +1562,7 @@ public class GsmCdmaCallTracker extends CallTracker { 
                            TelephonyManager.getDefault().getNetworkType());

                }



                if (isEmcRetryCause(causeCode)) {

                if (isEmcRetryCause(causeCode) && mPhone.useImsForEmergency()) {

                    String dialString = "";

                    for(Connection conn : mForegroundCall.mConnections) {

                        GsmCdmaConnection gsmCdmaConnection = (GsmCdmaConnection)conn;

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

+12 −7
Original line number Diff line number Diff line
@@ -1234,6 +1234,17 @@ public class GsmCdmaPhone extends Phone { 
                && (mImsPhone.getServiceState().getState() == ServiceState.STATE_IN_SERVICE);

    }



    public boolean useImsForEmergency() {

        CarrierConfigManager configManager =

                (CarrierConfigManager) mContext.getSystemService(Context.CARRIER_CONFIG_SERVICE);

        boolean alwaysTryImsForEmergencyCarrierConfig = configManager.getConfigForSubId(getSubId())

                .getBoolean(CarrierConfigManager.KEY_CARRIER_USE_IMS_FIRST_FOR_EMERGENCY_BOOL);

        return mImsPhone != null

                && alwaysTryImsForEmergencyCarrierConfig

                && ImsManager.getInstance(mContext, mPhoneId).isNonTtyOrTtyOnVolteEnabled()

                && mImsPhone.isImsAvailable();

    }



    @Override

    public Connection startConference(String[] participantsToDial, DialArgs dialArgs)

            throws CallStateException {
@@ -1279,19 +1290,13 @@ public class GsmCdmaPhone extends Phone { 


        CarrierConfigManager configManager =

                (CarrierConfigManager) mContext.getSystemService(Context.CARRIER_CONFIG_SERVICE);

        boolean alwaysTryImsForEmergencyCarrierConfig = configManager.getConfigForSubId(getSubId())

                .getBoolean(CarrierConfigManager.KEY_CARRIER_USE_IMS_FIRST_FOR_EMERGENCY_BOOL);



        /** Check if the call is Wireless Priority Service call */

        boolean isWpsCall = dialString != null ? dialString.startsWith(PREFIX_WPS) : false;

        boolean allowWpsOverIms = configManager.getConfigForSubId(getSubId())

                .getBoolean(CarrierConfigManager.KEY_SUPPORT_WPS_OVER_IMS_BOOL);



        boolean useImsForEmergency = imsPhone != null

                && isEmergency

                && alwaysTryImsForEmergencyCarrierConfig

                && ImsManager.getInstance(mContext, mPhoneId).isNonTtyOrTtyOnVolteEnabled()

                && imsPhone.isImsAvailable();

        boolean useImsForEmergency = isEmergency && useImsForEmergency();



        String dialPart = PhoneNumberUtils.extractNetworkPortionAlt(PhoneNumberUtils.

                stripSeparators(dialString));