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

Commit b5dfd7c4 authored by Pavel Zhamaitsiak's avatar Pavel Zhamaitsiak Committed by Android Git Automerger
Browse files

am af622cae: Merge "Uses TTY mode and VoLTE over TTY support to determine call... 

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

* commit 'af622cae':
  Uses TTY mode and VoLTE over TTY support to determine call type: IMS or CS.
parents 1732bc69 af622cae

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

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


        boolean imsUseEnabled =

                ImsManager.isVolteEnabledByPlatform(mContext) &&

                ImsManager.isEnhanced4gLteModeSettingEnabledByUser(mContext);

                ImsManager.isEnhanced4gLteModeSettingEnabledByUser(mContext) &&

                ImsManager.isNonTtyOrTtyOnVolteEnabled(mContext);

        if (!imsUseEnabled) {

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

        }

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

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


        boolean imsUseEnabled =

                ImsManager.isVolteEnabledByPlatform(mContext) &&

                ImsManager.isEnhanced4gLteModeSettingEnabledByUser(mContext);

                ImsManager.isEnhanced4gLteModeSettingEnabledByUser(mContext) &&

                ImsManager.isNonTtyOrTtyOnVolteEnabled(mContext);

        if (!imsUseEnabled) {

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

        }

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

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

                Settings.Secure.PREFERRED_TTY_MODE,

                Phone.TTY_MODE_OFF);

           mImsManager.setUiTTYMode(mServiceId, mPreferredTtyMode, null);

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



        } catch (ImsException e) {

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


    void setUiTTYMode(int uiTtyMode, Message onComplete) {

        try {

            mImsManager.setUiTTYMode(mServiceId, uiTtyMode, onComplete);

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

        } catch (ImsException e) {

            loge("setTTYMode : " + e);

            mPhone.sendErrorResponse(onComplete, e);