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

Commit b085023a authored by David van Tonder's avatar David van Tonder Committed by Gerrit Code Review
Browse files

Merge changes I93c102f9,Ie28b6bab into mr1-staging 

* changes:
  frameworks/base: Support for LTE network modes
  Do not set the network mode differently for LTE+CDMA
parents af753780 9e1abcd5

packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java

+0 −4
Original line number Diff line number Diff line
@@ -2196,12 +2196,8 @@ public class DatabaseHelper extends SQLiteOpenHelper { 


            // Set the preferred network mode to 0 = Global, CDMA default

            int type;

            if (TelephonyManager.getLteOnCdmaModeStatic() == PhoneConstants.LTE_ON_CDMA_TRUE) {

                type = Phone.NT_MODE_GLOBAL;

            } else {

                type = SystemProperties.getInt("ro.telephony.default_network",

                        RILConstants.PREFERRED_NETWORK_MODE);

            }

            loadSetting(stmt, Settings.Global.PREFERRED_NETWORK_MODE, type);



            // --- New global settings start here

telephony/java/android/telephony/TelephonyManager.java

+2 −0
Original line number Diff line number Diff line
@@ -377,6 +377,8 @@ public class TelephonyManager { 
        case RILConstants.NETWORK_MODE_GSM_ONLY:

        case RILConstants.NETWORK_MODE_WCDMA_ONLY:

        case RILConstants.NETWORK_MODE_GSM_UMTS:

        case RILConstants.NETWORK_MODE_LTE_GSM_WCDMA:

        case RILConstants.NETWORK_MODE_LTE_WCDMA:

            return PhoneConstants.PHONE_TYPE_GSM;



        // Use CDMA Phone for the global mode including CDMA

telephony/java/com/android/internal/telephony/RILConstants.java

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ public interface RILConstants { 
    int NETWORK_MODE_LTE_GSM_WCDMA  = 9; /* LTE, GSM/WCDMA */

    int NETWORK_MODE_LTE_CMDA_EVDO_GSM_WCDMA = 10; /* LTE, CDMA, EvDo, GSM/WCDMA */

    int NETWORK_MODE_LTE_ONLY       = 11; /* LTE Only mode. */



    int NETWORK_MODE_LTE_WCDMA      = 12; /* LTE/WCDMA */

    int PREFERRED_NETWORK_MODE      = NETWORK_MODE_WCDMA_PREF;



    int CDMA_CELL_BROADCAST_SMS_DISABLED = 1;