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

Commit 4a8477e5 authored by Amit Mahajan's avatar Amit Mahajan
Browse files

resolved conflicts for 51dda2a2 to master 

Change-Id: I6fcc47e532379a39b02bac391eeebf2c4cb83b39
parents e110a72c 51dda2a2

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

+6 −3
Original line number Diff line number Diff line
@@ -447,13 +447,16 @@ public class CDMAPhone extends PhoneBase { 
                && ImsManager.isNonTtyOrTtyOnVolteEnabled(mContext)

                && (imsPhone.getServiceState().getState() != ServiceState.STATE_POWER_OFF);



        boolean useImsForUt = imsPhone != null && imsPhone.isUtEnabled()

                && dialString.endsWith("#");

        boolean isUt = PhoneNumberUtils.extractNetworkPortionAlt(PhoneNumberUtils.

                stripSeparators(dialString)).endsWith("#");



        boolean useImsForUt = imsPhone != null && imsPhone.isUtEnabled();



        if (DBG) {

            Rlog.d(LOG_TAG, "imsUseEnabled=" + imsUseEnabled

                    + ", useImsForEmergency=" + useImsForEmergency

                    + ", useImsForUt=" + useImsForUt

                    + ", isUt=" + isUt

                    + ", imsPhone=" + imsPhone

                    + ", imsPhone.isVolteEnabled()="

                    + ((imsPhone != null) ? imsPhone.isVolteEnabled() : "N/A")
@@ -465,7 +468,7 @@ public class CDMAPhone extends PhoneBase { 


        ImsPhone.checkWfcWifiOnlyModeBeforeDial(mImsPhone, mContext);



        if (imsUseEnabled || useImsForEmergency || useImsForUt) {

        if ((imsUseEnabled && (!isUt || useImsForUt)) || useImsForEmergency) {

            try {

                if (DBG) Rlog.d(LOG_TAG, "Trying IMS PS call");

                return imsPhone.dial(dialString, uusInfo, videoState, intentExtras);

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

+6 −3
Original line number Diff line number Diff line
@@ -822,13 +822,16 @@ public class GSMPhone extends PhoneBase { 
                && ImsManager.isNonTtyOrTtyOnVolteEnabled(mContext)

                && (imsPhone.getServiceState().getState() != ServiceState.STATE_POWER_OFF);



        boolean useImsForUt = imsPhone != null && imsPhone.isUtEnabled()

                && dialString.endsWith("#");

        boolean isUt = PhoneNumberUtils.extractNetworkPortionAlt(PhoneNumberUtils.

                stripSeparators(dialString)).endsWith("#");



        boolean useImsForUt = imsPhone != null && imsPhone.isUtEnabled();



        if (LOCAL_DEBUG) {

            Rlog.d(LOG_TAG, "imsUseEnabled=" + imsUseEnabled

                    + ", useImsForEmergency=" + useImsForEmergency

                    + ", useImsForUt=" + useImsForUt

                    + ", isUt=" + isUt

                    + ", imsPhone=" + imsPhone

                    + ", imsPhone.isVolteEnabled()="

                    + ((imsPhone != null) ? imsPhone.isVolteEnabled() : "N/A")
@@ -840,7 +843,7 @@ public class GSMPhone extends PhoneBase { 


        ImsPhone.checkWfcWifiOnlyModeBeforeDial(mImsPhone, mContext);



        if (imsUseEnabled || useImsForEmergency || useImsForUt) {

        if ((imsUseEnabled && (!isUt || useImsForUt)) || useImsForEmergency) {

            try {

                if (LOCAL_DEBUG) Rlog.d(LOG_TAG, "Trying IMS PS call");

                return imsPhone.dial(dialString, uusInfo, videoState, intentExtras);