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

Commit 5292baf8 authored by SongFerng Wang's avatar SongFerng Wang Committed by Gerrit Code Review
Browse files

Merge "KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY change type as IntArray"

parents 7a8463db e88740ea

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

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

import androidx.preference.PreferenceScreen;

import androidx.preference.SwitchPreference;

import androidx.preference.SwitchPreference;





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

import com.android.settings.R;

import com.android.settings.R;

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

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

import com.android.settingslib.core.lifecycle.LifecycleObserver;

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




        mShow5gLimitedDialog = carrierConfig.getBoolean(

        mShow5gLimitedDialog = carrierConfig.getBoolean(

                CarrierConfigManager.KEY_VOLTE_5G_LIMITED_ALERT_DIALOG_BOOL);

                CarrierConfigManager.KEY_VOLTE_5G_LIMITED_ALERT_DIALOG_BOOL);

        mIsNrEnabledFromCarrierConfig = carrierConfig.getInt(



                CarrierConfigManager.KEY_CARRIER_NR_AVAILABILITY_INT)

        int[] nrAvailabilities = carrierConfig.getIntArray(

                != CarrierConfigManager.CARRIER_NR_AVAILABILITY_NONE;

                CarrierConfigManager.KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY);

        mIsNrEnabledFromCarrierConfig = !ArrayUtils.isEmpty(nrAvailabilities);

        return this;

        return this;

    }

    }