From 7a4d0284cc2b358e174fcb257626f3d037d3dc52 Mon Sep 17 00:00:00 2001
From: Hakjun Choi <hakjunc@google.com>
Date: Tue, 26 Mar 2024 16:56:10 +0000
Subject: [PATCH] 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
---
 .../settings/network/telephony/NetworkSelectSettings.java     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/com/android/settings/network/telephony/NetworkSelectSettings.java b/src/com/android/settings/network/telephony/NetworkSelectSettings.java
index 461930b9e81..c8617afb38c 100644
--- a/src/com/android/settings/network/telephony/NetworkSelectSettings.java
+++ b/src/com/android/settings/network/telephony/NetworkSelectSettings.java
@@ -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);
     }