PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY change type as IntArray" into sc-dev am: 993b820a76

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13824401

Change-Id: I392c2009454cebafbc1d9082e597b1402eb27a37
This commit is contained in:
SongFerng Wang
2021-03-19 01:49:29 +00:00
committed by Automerger Merge Worker
parent c46da1bd47 993b820a76
commit 155445d472
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/network/telephony/Enhanced4gBasePreferenceController.java
View File

@@ -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;
}