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

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

Fix useImsForUt check 

The check was looking at last character to determine if dialed
number is UT which is not correct. Should look at the last character
of the network portion.

Bug: 24125413
Change-Id: I21e0d2ffac4548d74e68355db86a98516daee304
parent 4677e1d9

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

+6 −3
Original line number Diff line number Diff line
@@ -442,13 +442,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")
@@ -460,7 +463,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

+7 −4
Original line number Diff line number Diff line
@@ -817,13 +817,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")
@@ -835,7 +838,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);