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

Commit 1f059ef7 authored by Etan Cohen's avatar Etan Cohen Committed by Android (Google) Code Review
Browse files

Merge "UE doesn't make 1x call if IMS not registered." into mnc-dev

parents 7c107e94 3eb86908

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

+2 −2
Original line number Diff line number Diff line
@@ -472,8 +472,8 @@ public class CDMAPhone extends PhoneBase { 
            }

        }



        if ((mSST != null) && (mSST.mSS.getState() == ServiceState.STATE_OUT_OF_SERVICE)

                && !isEmergency) {

        if (mSST != null && mSST.mSS.getState() == ServiceState.STATE_OUT_OF_SERVICE

                && mSST.mSS.getDataRegState() != ServiceState.STATE_IN_SERVICE && !isEmergency) {

            throw new CallStateException("cannot dial in current state");

        }

        if (DBG) Rlog.d(LOG_TAG, "Trying (non-IMS) CS call");

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

+2 −2
Original line number Diff line number Diff line
@@ -847,8 +847,8 @@ public class GSMPhone extends PhoneBase { 
            }

        }



        if ((mSST != null) && (mSST.mSS.getState() == ServiceState.STATE_OUT_OF_SERVICE)

                && !isEmergency) {

        if (mSST != null && mSST.mSS.getState() == ServiceState.STATE_OUT_OF_SERVICE

                && mSST.mSS.getDataRegState() != ServiceState.STATE_IN_SERVICE && !isEmergency) {

            throw new CallStateException("cannot dial in current state");

        }

        if (LOCAL_DEBUG) Rlog.d(LOG_TAG, "Trying (non-IMS) CS call");