Merge "Add carrier satellite feature flag into filter out logic in Settings" into 24D1-dev (e479584d) · Commits · e / os / android_packages_apps_Settings

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