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

Commit 95149fde authored by Etan Cohen's avatar Etan Cohen Committed by Android (Google) Code Review
Browse files

Merge "Only use IMS for E911 if VoLTE is supported on device/carrier." into mnc-dev

parents 2dc07334 5f15c3f0

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

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

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



        boolean useImsForEmergency = imsPhone != null

        boolean useImsForEmergency = ImsManager.isVolteEnabledByPlatform(mContext)

                && imsPhone != null

                && isEmergency

                &&  mContext.getResources().getBoolean(

                        com.android.internal.R.bool.useImsAlwaysForEmergencyCall)

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

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

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



        boolean useImsForEmergency = imsPhone != null

        boolean useImsForEmergency = ImsManager.isVolteEnabledByPlatform(mContext

                && imsPhone != null

                && isEmergency

                &&  mContext.getResources().getBoolean(

                        com.android.internal.R.bool.useImsAlwaysForEmergencyCall)