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

Commit 7271bcbf authored by Amit Mahajan's avatar Amit Mahajan Committed by Android Git Automerger
Browse files

am d2a61495: am 594d0654: Merge "Ignore isVolteEnabledByPlatform when checking... 

am d2a61495: am 594d0654: Merge "Ignore isVolteEnabledByPlatform when checking useImsForEmergency" into mnc-dr-dev

* commit 'd2a61495':
  Ignore isVolteEnabledByPlatform when checking useImsForEmergency
parents 214f9249 d2a61495

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

+1 −2
Original line number Diff line number Diff line
@@ -435,8 +435,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

                &&  mContext.getResources().getBoolean(

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

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

+1 −2
Original line number Diff line number Diff line
@@ -810,8 +810,7 @@ public class GSMPhone 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

                &&  mContext.getResources().getBoolean(

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