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

Commit 16c247df authored by Ricardo Cerqueira's avatar Ricardo Cerqueira Committed by Gerrit Code Review
Browse files

Merge changes I8833fe3e,I546c939f,I11fff596 into mr1-staging 

* changes:
  Telephony: Support for LTE network modes
  Telephony: Look for CSS indicator for voice+data
  Initialize RIL with the correct CDMA subscription mode setting
parents 550448d0 8c14bef9

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

+6 −3
Original line number Diff line number Diff line
@@ -126,10 +126,13 @@ public interface Phone { 
    int NT_MODE_EVDO_NO_CDMA = RILConstants.NETWORK_MODE_EVDO_NO_CDMA;

    int NT_MODE_GLOBAL       = RILConstants.NETWORK_MODE_GLOBAL;



    int NT_MODE_LTE_CDMA_AND_EVDO        = RILConstants.NETWORK_MODE_LTE_CDMA_EVDO;

    int NT_MODE_LTE_GSM_WCDMA            = RILConstants.NETWORK_MODE_LTE_GSM_WCDMA;

    int NT_MODE_LTE_CMDA_EVDO_GSM_WCDMA  = RILConstants.NETWORK_MODE_LTE_CMDA_EVDO_GSM_WCDMA;

    int NT_MODE_LTE_ONLY                 = RILConstants.NETWORK_MODE_LTE_ONLY;

    int NT_MODE_LTE_WCDMA                = RILConstants.NETWORK_MODE_LTE_WCDMA;

    int PREFERRED_NT_MODE                = RILConstants.PREFERRED_NETWORK_MODE;





    // Used for CDMA roaming mode

    static final int CDMA_RM_HOME        = 0;  // Home Networks only, as defined in PRL

    static final int CDMA_RM_AFFILIATED  = 1;  // Roaming an Affiliated networks, as defined in PRL

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

+3 −22
Original line number Diff line number Diff line
@@ -112,30 +112,11 @@ public class PhoneFactory { 
                        Settings.Global.PREFERRED_NETWORK_MODE, preferredNetworkMode);

                Log.i(LOG_TAG, "Network Mode set to " + Integer.toString(networkMode));



                // Get cdmaSubscription

                // TODO: Change when the ril will provides a way to know at runtime

                //       the configuration, bug 4202572. And the ril issues the

                //       RIL_UNSOL_CDMA_SUBSCRIPTION_SOURCE_CHANGED, bug 4295439.

                // Get cdmaSubscription mode from Settings.Global

                int cdmaSubscription;

                int lteOnCdma = TelephonyManager.getLteOnCdmaModeStatic();

                switch (lteOnCdma) {

                    case PhoneConstants.LTE_ON_CDMA_FALSE:

                        cdmaSubscription = CdmaSubscriptionSourceManager.SUBSCRIPTION_FROM_NV;

                        Log.i(LOG_TAG, "lteOnCdma is 0 use SUBSCRIPTION_FROM_NV");

                        break;

                    case PhoneConstants.LTE_ON_CDMA_TRUE:

                        cdmaSubscription = CdmaSubscriptionSourceManager.SUBSCRIPTION_FROM_RUIM;

                        Log.i(LOG_TAG, "lteOnCdma is 1 use SUBSCRIPTION_FROM_RUIM");

                        break;

                    case PhoneConstants.LTE_ON_CDMA_UNKNOWN:

                    default:

                        //Get cdmaSubscription mode from Settings.System

                cdmaSubscription = Settings.Global.getInt(context.getContentResolver(),

                                Settings.Global.PREFERRED_CDMA_SUBSCRIPTION,

                                Settings.Global.CDMA_SUBSCRIPTION_MODE,

                                preferredCdmaSubscription);

                        Log.i(LOG_TAG, "lteOnCdma not set, using PREFERRED_CDMA_SUBSCRIPTION");

                        break;

                }

                Log.i(LOG_TAG, "Cdma Subscription set to " + cdmaSubscription);



                //reads the system properties and makes commandsinterface

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

+6 −4
Original line number Diff line number Diff line
@@ -561,10 +561,12 @@ public class CdmaLteServiceStateTracker extends CdmaServiceStateTracker { 


    @Override

    public boolean isConcurrentVoiceAndDataAllowed() {

        // Note: it needs to be confirmed which CDMA network types

        // can support voice and data calls concurrently.

        // For the time-being, the return value will be false.

        return (mRilRadioTechnology == ServiceState.RIL_RADIO_TECHNOLOGY_LTE);

        // For non-LTE, look at the CSS indicator to check on SV capability

        if (mRilRadioTechnology == ServiceState.RIL_RADIO_TECHNOLOGY_LTE) {

            return true;

        } else {

            return ss.getCssIndicator() == 1;

        }

    }



    /**