From e3f0ebfe5b6c9720150f87c6b5519d5042d395bd Mon Sep 17 00:00:00 2001
From: Hakjun Choi <hakjunc@google.com>
Date: Mon, 9 Dec 2024 19:25:42 +0000
Subject: [PATCH] Prevent possible crash by adding null pointer check

Flag: EXEMPT bug fix
Bug: 383144219
Test: manually test if it works finely
Test: atest NetworkSelectRepositoryTest NetworkSelectSettingsTest
Change-Id: I55c50c7ed9856461e00239df2a683693510fd0b7
---
 .../settings/network/telephony/NetworkSelectRepository.kt    | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/com/android/settings/network/telephony/NetworkSelectRepository.kt b/src/com/android/settings/network/telephony/NetworkSelectRepository.kt
index 219f9db6315..70dd8358df6 100644
--- a/src/com/android/settings/network/telephony/NetworkSelectRepository.kt
+++ b/src/com/android/settings/network/telephony/NetworkSelectRepository.kt
@@ -98,6 +98,11 @@ class NetworkSelectRepository(context: Context, private val subId: Int) {
             return emptyList()
         }
 
+        if (carrierConfigManager == null) {
+            Log.d(TAG, "carrierConfigManager is null")
+            return emptyList()
+        }
+
         val config = carrierConfigManager.getConfigForSubId(
             subId,
             CarrierConfigManager.KEY_REMOVE_SATELLITE_PLMN_IN_MANUAL_NETWORK_SCAN_BOOL