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

Commit 85b0f5fc authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Add NR Global to the logic to check if it is Global" into rvc-dev am: 76f4a295 

Change-Id: I786ed0fefff2d5a81b31b475c154933a5ba5aac5
parents 05985cb2 76f4a295

src/com/android/settings/network/telephony/MobileNetworkUtils.java

+12 −4
Original line number Diff line number Diff line
@@ -26,6 +26,10 @@ import static com.android.settings.network.telephony.TelephonyConstants.RadioAcc 
import static com.android.settings.network.telephony.TelephonyConstants.RadioAccessFamily.RAF_TD_SCDMA;

import static com.android.settings.network.telephony.TelephonyConstants.RadioAccessFamily.RAF_UNKNOWN;

import static com.android.settings.network.telephony.TelephonyConstants.RadioAccessFamily.WCDMA;

import static com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA;

import static com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants.NETWORK_MODE_LTE_CDMA_EVDO;

import static com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants.NETWORK_MODE_NR_LTE_CDMA_EVDO;

import static com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants.NETWORK_MODE_NR_LTE_GSM_WCDMA;



import android.content.ContentResolver;

import android.content.Context;
@@ -379,8 +383,10 @@ public class MobileNetworkUtils { 
                    context.getContentResolver(),

                    android.provider.Settings.Global.PREFERRED_NETWORK_MODE + subId,

                    TelephonyManager.DEFAULT_PREFERRED_NETWORK_MODE);

            if (settingsNetworkMode == TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA

                    || settingsNetworkMode == TelephonyManagerConstants.NETWORK_MODE_LTE_CDMA_EVDO) {

            if (settingsNetworkMode == NETWORK_MODE_LTE_GSM_WCDMA

                    || settingsNetworkMode == NETWORK_MODE_LTE_CDMA_EVDO

                    || settingsNetworkMode == NETWORK_MODE_NR_LTE_GSM_WCDMA

                    || settingsNetworkMode == NETWORK_MODE_NR_LTE_CDMA_EVDO) {

                return true;

            }
@@ -407,8 +413,10 @@ public class MobileNetworkUtils { 
                android.provider.Settings.Global.PREFERRED_NETWORK_MODE + subId,

                TelephonyManager.DEFAULT_PREFERRED_NETWORK_MODE);

        if (isWorldMode(context, subId)) {

            if (networkMode == TelephonyManagerConstants.NETWORK_MODE_LTE_CDMA_EVDO

                    || networkMode == TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA) {

            if (networkMode == NETWORK_MODE_LTE_CDMA_EVDO

                    || networkMode == NETWORK_MODE_LTE_GSM_WCDMA

                    || networkMode == NETWORK_MODE_NR_LTE_CDMA_EVDO

                    || networkMode == NETWORK_MODE_NR_LTE_GSM_WCDMA) {

                return true;

            } else if (shouldSpeciallyUpdateGsmCdma(context, subId)) {

                return true;

src/com/android/settings/network/telephony/cdma/CdmaSystemSelectPreferenceController.java

+6 −2
Original line number Diff line number Diff line
@@ -16,6 +16,9 @@ 


package com.android.settings.network.telephony.cdma;



import static com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA;

import static com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants.NETWORK_MODE_NR_LTE_GSM_WCDMA;



import android.content.Context;

import android.provider.Settings;

import android.telephony.TelephonyManager;
@@ -53,8 +56,9 @@ public class CdmaSystemSelectPreferenceController extends CdmaBasePreferenceCont 
                mContext.getContentResolver(),

                Settings.Global.PREFERRED_NETWORK_MODE + mSubId,

                TelephonyManager.DEFAULT_PREFERRED_NETWORK_MODE);

        listPreference.setEnabled(

                settingsNetworkMode != TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA);

        final boolean enableList = settingsNetworkMode != NETWORK_MODE_LTE_GSM_WCDMA

                && settingsNetworkMode != NETWORK_MODE_NR_LTE_GSM_WCDMA;

        listPreference.setEnabled(enableList);

    }



    @Override