From 65cb3dfee7002fb628571d0d52b1b52258b3895f Mon Sep 17 00:00:00 2001
From: Hakjun Choi <hakjunc@google.com>
Date: Wed, 17 Apr 2024 16:25:20 +0000
Subject: [PATCH] Return empty list when SatelliteManager is not created

TelephonyFrameworkInitializer returns null for SatelliteManager when the feature PackageManager.FEATURE_TELEPHONY_SATELLITE is not enabled.
Therefore it is needed to add a exception handling for the case SatelliteManager is null.

Bug: 331182758
Test: manually select choose network in Settings menu from CuttleFish to reproduce
Change-Id: I5faf4f10585b78aada00d0a925d005de1dd71de1
---
 .../network/telephony/NetworkSelectSettings.java         | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/network/telephony/NetworkSelectSettings.java b/src/com/android/settings/network/telephony/NetworkSelectSettings.java
index 018816658ce..510bfd68944 100644
--- a/src/com/android/settings/network/telephony/NetworkSelectSettings.java
+++ b/src/com/android/settings/network/telephony/NetworkSelectSettings.java
@@ -167,6 +167,7 @@ public class NetworkSelectSettings extends DashboardFragment {
 
     @Keep
     @VisibleForTesting
+    @Nullable
     protected SatelliteManager getSatelliteManager(Context context) {
         return context.getSystemService(SatelliteManager.class);
     }
@@ -359,7 +360,13 @@ public class NetworkSelectSettings extends DashboardFragment {
         if (!Flags.carrierEnabledSatelliteFlag()) {
             return new ArrayList<>();
         }
-        return mSatelliteManager.getSatellitePlmnsForCarrier(mSubId);
+
+        if (mSatelliteManager != null) {
+            return mSatelliteManager.getSatellitePlmnsForCarrier(mSubId);
+        } else {
+            Log.e(TAG, "mSatelliteManager is null, return empty list");
+            return new ArrayList<>();
+        }
     }
 
     private void handleCarrierConfigChanged(int subId) {