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

Commit e0567274 authored by Amit Mahajan's avatar Amit Mahajan
Browse files

resolved conflicts for 7271bcbf to master 

Change-Id: I69bc8f4b8e9a6a69dc52999bf307a73ae5257789
parents c6c214d1 7271bcbf

src/java/com/android/internal/telephony/cdma/CDMAPhone.java

+1 −2
Original line number Diff line number Diff line
@@ -441,8 +441,7 @@ public class CDMAPhone extends PhoneBase { 
                 && (imsPhone.isVolteEnabled() || imsPhone.isVowifiEnabled())

                 && (imsPhone.getServiceState().getState() == ServiceState.STATE_IN_SERVICE);



        boolean useImsForEmergency = ImsManager.isVolteEnabledByPlatform(mContext)

                && imsPhone != null

        boolean useImsForEmergency = imsPhone != null

                && isEmergency

                && alwaysTryImsForEmergencyCarrierConfig

                && ImsManager.isNonTtyOrTtyOnVolteEnabled(mContext)

src/java/com/android/internal/telephony/gsm/GSMPhone.java

+1 −2
Original line number Diff line number Diff line
@@ -816,8 +816,7 @@ public class GSMPhone extends PhoneBase { 
        boolean alwaysTryImsForEmergencyCarrierConfig = configManager.getConfigForSubId(getSubId())

                .getBoolean(CarrierConfigManager.KEY_CARRIER_USE_IMS_FIRST_FOR_EMERGENCY_BOOL);



        boolean useImsForEmergency = ImsManager.isVolteEnabledByPlatform(mContext)

                && imsPhone != null

        boolean useImsForEmergency = imsPhone != null

                && isEmergency

                && alwaysTryImsForEmergencyCarrierConfig

                && ImsManager.isNonTtyOrTtyOnVolteEnabled(mContext)