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

Commit 7b918770 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android Git Automerger
Browse files

am b24d4a60: am 6ce6af46: Migrate telephony settings to Global. 

* commit 'b24d4a60':
  Migrate telephony settings to Global.
parents 33f1ee53 b24d4a60

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

+4 −4
Original line number Diff line number Diff line
@@ -106,8 +106,8 @@ public class PhoneFactory { 
                if (TelephonyManager.getLteOnCdmaModeStatic() == PhoneConstants.LTE_ON_CDMA_TRUE) {

                    preferredNetworkMode = Phone.NT_MODE_GLOBAL;

                }

                int networkMode = Settings.Secure.getInt(context.getContentResolver(),

                        Settings.Secure.PREFERRED_NETWORK_MODE, preferredNetworkMode);

                int networkMode = Settings.Global.getInt(context.getContentResolver(),

                        Settings.Global.PREFERRED_NETWORK_MODE, preferredNetworkMode);

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



                // Get cdmaSubscription
@@ -128,8 +128,8 @@ public class PhoneFactory { 
                    case PhoneConstants.LTE_ON_CDMA_UNKNOWN:

                    default:

                        //Get cdmaSubscription mode from Settings.System

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

                                Settings.Secure.PREFERRED_CDMA_SUBSCRIPTION,

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

                                Settings.Global.PREFERRED_CDMA_SUBSCRIPTION,

                                preferredCdmaSubscription);

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

                        break;

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

+2 −2
Original line number Diff line number Diff line
@@ -286,9 +286,9 @@ public class CdmaLteServiceStateTracker extends CdmaServiceStateTracker { 
        // To set in LTE only mode, sqlite3 /data/data/com.android.providers.settings/

        // databases/settings.db "update secure set value='11' where name='preferred_network_mode'"

        if (newSS.getState() == ServiceState.STATE_OUT_OF_SERVICE) {

            int networkMode = android.provider.Settings.Secure.getInt(phone.getContext()

            int networkMode = android.provider.Settings.Global.getInt(phone.getContext()

                                  .getContentResolver(),

                                  android.provider.Settings.Secure.PREFERRED_NETWORK_MODE,

                                  android.provider.Settings.Global.PREFERRED_NETWORK_MODE,

                                  RILConstants.PREFERRED_NETWORK_MODE);

            if (networkMode == RILConstants.NETWORK_MODE_LTE_ONLY) {

                if (DBG) log("pollState: LTE Only mode");