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

Commit 20d28263 authored by calvinpan's avatar calvinpan Committed by Bonian Chen
Browse files

Add NR Global to the logic to check if it is Global 

Bug: 151285260
Test: Build pass
Merged-In: I4d84c6669d6385bef5d75fca4cd6f2ff17533b6e
Change-Id: I5b0414302c9214116de30212a03a36972af29ca1
parent c78b12f3

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

+21 −4
Original line number Diff line number Diff line
@@ -18,6 +18,19 @@ package com.android.settings.network.telephony; 


import static android.provider.Telephony.Carriers.ENFORCE_MANAGED_URI;



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

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

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

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

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

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;

import android.content.Intent;
@@ -403,8 +416,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;

            }
@@ -431,8 +446,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