Merge "Prevent possible crash by adding null pointer check" into main

2025-01-02 18:47:27 -08:00
parent 2d2770b835 e3f0ebfe5b
commit 5a622211dc
1 changed files with 5 additions and 0 deletions
--- 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