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

Commit 7a4d0284 authored by Hakjun Choi's avatar Hakjun Choi
Browse files

Add carrier satellite feature flag into filter out logic in Settings 

Null object reference exception happend when carrier satellite feature is disabled. whille filtering out satellite plmns from scanned plmns

Bug: 331182758
Test: atest NetworkSelectSettingsTest, manually test with feature enabled/disabled on pixel
Change-Id: I394e86ee9c26efdc9920006e0b8ca015500d5162
parent 8cc6c89e

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

+4 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ import androidx.preference.PreferenceCategory; 


import com.android.internal.annotations.Initializer;

import com.android.internal.telephony.OperatorInfo;

import com.android.internal.telephony.flags.Flags;

import com.android.settings.R;

import com.android.settings.dashboard.DashboardFragment;

import com.android.settings.overlay.FeatureFactory;
@@ -437,6 +438,9 @@ public class NetworkSelectSettings extends DashboardFragment { 
     */

    @VisibleForTesting

    protected List<String> getSatellitePlmnsForCarrierWrapper() {

        if (!Flags.carrierEnabledSatelliteFlag()) {

            return new ArrayList<>();

        }

        return mSatelliteManager.getSatellitePlmnsForCarrier(mSubId);

    }