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

Commit aff0ac4d authored by Wink Saville's avatar Wink Saville Committed by Gerrit Code Review
Browse files

Merge "Do not set the network mode differently for LTE+CDMA"

parents e3b94f05 97ecc9ec

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

+3 −6
Original line number Diff line number Diff line
@@ -2225,14 +2225,11 @@ public class DatabaseHelper extends SQLiteOpenHelper { 
            // Set default cdma call auto retry

            loadSetting(stmt, Settings.Global.CALL_AUTO_RETRY, 0);



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

            // Set the preferred network mode to target desired value or Default

            // value defined in RILConstants

            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