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

Commit af622cae authored by Pavel Zhamaitsiak's avatar Pavel Zhamaitsiak Committed by Android (Google) Code Review
Browse files

Merge "Uses TTY mode and VoLTE over TTY support to determine call type: IMS or... 

Merge "Uses TTY mode and VoLTE over TTY support to determine call type: IMS or CS." into lmp-mr1-dev
parents bd4bb4f2 f1099a9d

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -405,7 +405,8 @@ public class CDMAPhone extends PhoneBase { 




        boolean imsUseEnabled =

        boolean imsUseEnabled =

                ImsManager.isVolteEnabledByPlatform(mContext) &&

                ImsManager.isVolteEnabledByPlatform(mContext) &&

                ImsManager.isEnhanced4gLteModeSettingEnabledByUser(mContext);

                ImsManager.isEnhanced4gLteModeSettingEnabledByUser(mContext) &&

                ImsManager.isNonTtyOrTtyOnVolteEnabled(mContext);

        if (!imsUseEnabled) {

        if (!imsUseEnabled) {

            Rlog.w(LOG_TAG, "IMS is disabled: forced to CS");

            Rlog.w(LOG_TAG, "IMS is disabled: forced to CS");

        }

        }

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -802,7 +802,8 @@ public class GSMPhone extends PhoneBase { 




        boolean imsUseEnabled =

        boolean imsUseEnabled =

                ImsManager.isVolteEnabledByPlatform(mContext) &&

                ImsManager.isVolteEnabledByPlatform(mContext) &&

                ImsManager.isEnhanced4gLteModeSettingEnabledByUser(mContext);

                ImsManager.isEnhanced4gLteModeSettingEnabledByUser(mContext) &&

                ImsManager.isNonTtyOrTtyOnVolteEnabled(mContext);

        if (!imsUseEnabled) {

        if (!imsUseEnabled) {

            Rlog.w(LOG_TAG, "IMS is disabled: forced to CS");

            Rlog.w(LOG_TAG, "IMS is disabled: forced to CS");

        }

        }

src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -224,7 +224,7 @@ public final class ImsPhoneCallTracker extends CallTracker { 
                mPhone.getContext().getContentResolver(),

                mPhone.getContext().getContentResolver(),

                Settings.Secure.PREFERRED_TTY_MODE,

                Settings.Secure.PREFERRED_TTY_MODE,

                Phone.TTY_MODE_OFF);

                Phone.TTY_MODE_OFF);

           mImsManager.setUiTTYMode(mServiceId, mPreferredTtyMode, null);

           mImsManager.setUiTTYMode(mPhone.getContext(), mServiceId, mPreferredTtyMode, null);





        } catch (ImsException e) {

        } catch (ImsException e) {

            loge("getImsService: " + e);

            loge("getImsService: " + e);
@@ -659,7 +659,7 @@ public final class ImsPhoneCallTracker extends CallTracker { 




    void setUiTTYMode(int uiTtyMode, Message onComplete) {

    void setUiTTYMode(int uiTtyMode, Message onComplete) {

        try {

        try {

            mImsManager.setUiTTYMode(mServiceId, uiTtyMode, onComplete);

            mImsManager.setUiTTYMode(mPhone.getContext(), mServiceId, uiTtyMode, onComplete);

        } catch (ImsException e) {

        } catch (ImsException e) {

            loge("setTTYMode : " + e);

            loge("setTTYMode : " + e);

            mPhone.sendErrorResponse(onComplete, e);

            mPhone.sendErrorResponse(onComplete, e);