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

Commit 8722e00b authored by SongFerng Wang's avatar SongFerng Wang Committed by Automerger Merge Worker
Browse files

Merge "KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY change type as IntArray" am:... 

Merge "KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY change type as IntArray" am: 5292baf8 am: d1278a3d

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1645427

Change-Id: I2618da0e75674e7c3c878f5aee50278ac0c0e76a
parents 1f5c043b d1278a3d

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

+5 −3
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import androidx.preference.Preference; 
import androidx.preference.PreferenceScreen;

import androidx.preference.SwitchPreference;



import com.android.internal.telephony.util.ArrayUtils;

import com.android.settings.R;

import com.android.settings.network.ims.VolteQueryImsState;

import com.android.settingslib.core.lifecycle.LifecycleObserver;
@@ -95,9 +96,10 @@ public class Enhanced4gBasePreferenceController extends TelephonyTogglePreferenc 


        mShow5gLimitedDialog = carrierConfig.getBoolean(

                CarrierConfigManager.KEY_VOLTE_5G_LIMITED_ALERT_DIALOG_BOOL);

        mIsNrEnabledFromCarrierConfig = carrierConfig.getInt(

                CarrierConfigManager.KEY_CARRIER_NR_AVAILABILITY_INT)

                != CarrierConfigManager.CARRIER_NR_AVAILABILITY_NONE;



        int[] nrAvailabilities = carrierConfig.getIntArray(

                CarrierConfigManager.KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY);

        mIsNrEnabledFromCarrierConfig = !ArrayUtils.isEmpty(nrAvailabilities);

        return this;

    }