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

Commit 8f0e8322 authored by Brad Ebinger's avatar Brad Ebinger Committed by Gerrit Code Review
Browse files

Merge changes I483e2263,Ie48fa9e2,Id3c350cd 

* changes:
  Fix SMS(over IMS) to 911 in LTE
  Fix unwanted data call deactivate when nonpreferred apn deleted
  SMS support for 5G SA
parents db3d3d8b f3e4e2ac

src/java/com/android/internal/telephony/ImsSmsDispatcher.java

+2 −2
Original line number Diff line number Diff line
@@ -275,9 +275,9 @@ public class ImsSmsDispatcher extends SMSDispatcher { 
    }



    private boolean isLteService() {

        return ((mPhone.getServiceState().getRilVoiceRadioTechnology() ==

        return ((mPhone.getServiceState().getRilDataRadioTechnology() ==

            ServiceState.RIL_RADIO_TECHNOLOGY_LTE) && (mPhone.getServiceState().

                getState() == ServiceState.STATE_IN_SERVICE));

                getDataRegState() == ServiceState.STATE_IN_SERVICE));

    }



    private boolean isLimitedLteService() {

src/java/com/android/internal/telephony/dataconnection/DcTracker.java

+15 −3
Original line number Diff line number Diff line
@@ -4109,6 +4109,7 @@ public class DcTracker extends Handler { 
                return;

            }

            for (ApnContext apnContext : mApnContexts.values()) {

                boolean cleanupRequired = false;

                if (!apnContext.isDisconnected()) {

                    ArrayList<ApnSetting> currentWaitingApns = apnContext.getWaitingApns();

                    ArrayList<ApnSetting> waitingApns = buildWaitingApns(
@@ -4123,6 +4124,16 @@ public class DcTracker extends Handler { 
                            || !containsAllApns(currentWaitingApns, waitingApns))) {

                        if (VDBG) log("new waiting apn is different for " + apnContext);

                        apnContext.setWaitingApns(waitingApns);

                        ApnSetting apnSetting = apnContext.getApnSetting();

                        if (apnContext.getApnType().equals(PhoneConstants.APN_TYPE_DEFAULT)) {

                            if ((getPreferredApn() == null)

                                    || !apnSetting.equals(getPreferredApn())) {

                                cleanupRequired = true;

                            }

                        } else if (!waitingApns.contains(apnSetting)) {

                            cleanupRequired = true;

                        }

                        if (cleanupRequired) {

                            if (VDBG) log("cleanUpConnectionsOnUpdatedApns for " + apnContext);

                            apnContext.setReason(reason);

                            cleanUpConnectionInternal(true, RELEASE_TYPE_DETACH, apnContext);
@@ -4130,6 +4141,7 @@ public class DcTracker extends Handler { 
                    }

                }

            }

        }



        if (!isConnected()) {

            stopNetStatPoll();

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

+6 −2
Original line number Diff line number Diff line
@@ -185,9 +185,13 @@ public final class GsmSMSDispatcher extends SMSDispatcher { 


        // if sms over IMS is not supported on data and voice is not available...

        if (!isIms() && ss != ServiceState.STATE_IN_SERVICE) {

        //In 5G case only Data Rat is reported.

            if(mPhone.getServiceState().getRilDataRadioTechnology()

                    != ServiceState.RIL_RADIO_TECHNOLOGY_NR) {

                tracker.onFailed(mContext, getNotInServiceError(ss), NO_ERROR_CODE);

                return;

            }

        }



        Message reply = obtainMessage(EVENT_SEND_SMS_COMPLETE, tracker);

        HashMap<String, Object> map = tracker.getData();