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

Commit 748e0d5d authored by Hakjun Choi's avatar Hakjun Choi Committed by Automerger Merge Worker
Browse files

Merge "Add carrier satellite feature flag into filter out logic in Settings"... 

Merge "Add carrier satellite feature flag into filter out logic in Settings" into 24D1-dev am: e479584d

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



Change-Id: Idd987b67733e17de46ec76001cf52bc0cf2bf5e5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c35fc38b e479584d

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

+4 −0
Original line number Diff line number Diff line
@@ -44,6 +44,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.network.telephony.scan.NetworkScanRepository;
@@ -355,6 +356,9 @@ public class NetworkSelectSettings extends DashboardFragment { 
     */

    @VisibleForTesting

    protected List<String> getSatellitePlmnsForCarrierWrapper() {

        if (!Flags.carrierEnabledSatelliteFlag()) {

            return new ArrayList<>();

        }

        return mSatelliteManager.getSatellitePlmnsForCarrier(mSubId);

    }