From e88740eae22be093784ee59c4239b21a9ea2f98e Mon Sep 17 00:00:00 2001 From: SongFerngWang Date: Thu, 11 Mar 2021 13:24:03 +0800 Subject: [PATCH] KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY change type as IntArray Bug: 179814490 Test: build pass Change-Id: I9d2abe1abe3082267ed64b71602d8ada21c95c6c Merged-In: I9d2abe1abe3082267ed64b71602d8ada21c95c6c --- .../telephony/Enhanced4gBasePreferenceController.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/com/android/settings/network/telephony/Enhanced4gBasePreferenceController.java b/src/com/android/settings/network/telephony/Enhanced4gBasePreferenceController.java index 989cb028455..78c4036ab73 100644 --- a/src/com/android/settings/network/telephony/Enhanced4gBasePreferenceController.java +++ b/src/com/android/settings/network/telephony/Enhanced4gBasePreferenceController.java @@ -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; }