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

Commit e2be0651 authored by Wink Saville's avatar Wink Saville Committed by Android Git Automerger
Browse files

am f313da5b: am aff0ac4d: Merge "Do not set the network mode differently for LTE+CDMA" 

* commit 'f313da5b':
  Do not set the network mode differently for LTE+CDMA
parents 3b5d686e f313da5b

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

+3 −6
Original line number Diff line number Diff line
@@ -2239,14 +2239,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