commit 9aed930bc076bbd799715873819ef317070c9e88
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Dec 15 00:40:24 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Dec 15 00:40:24 2023 +0000
tree ccb7c673844646c515851279f988c337f2d8afbf
parent 62f0d49839898c7f4e1ca99c99dbba3cc9acf42b
parent 6646316362082eebde42e4b69ee53e6e98017d9b

Snap for 11220357 from 6646316362082eebde42e4b69ee53e6e98017d9b to 24Q1-release

Change-Id: I0dd841ee6104e591ed87796c4d089a89010de78a

src/com/android/contacts/sdn/SdnRepository.kt

diff --git a/src/com/android/contacts/sdn/SdnRepository.kt b/src/com/android/contacts/sdn/SdnRepository.kt
index 082adeb..0759127 100644
--- a/src/com/android/contacts/sdn/SdnRepository.kt
+++ b/src/com/android/contacts/sdn/SdnRepository.kt
@@ -63,7 +63,7 @@
   @SuppressLint("MissingPermission")
   fun getSimCardInformation(): List<SimCard> {
     val subscriptionManager = context.getSystemService(SubscriptionManager::class.java)
-    return subscriptionManager.activeSubscriptionInfoList?.filterNotNull()?.mapNotNull {
+    return subscriptionManager?.activeSubscriptionInfoList?.filterNotNull()?.mapNotNull {
       if (it.subscriptionId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
         null
       } else {
@@ -77,7 +77,7 @@
   private fun fetchSdnFromCarrierConfig(simCard: SimCard): List<Sdn> {
     val carrierConfigManager = context.getSystemService(CarrierConfigManager::class.java)
     val carrierConfig =
-      carrierConfigManager.getConfigForSubId(simCard.subscriptionId) ?: return emptyList()
+      carrierConfigManager?.getConfigForSubId(simCard.subscriptionId) ?: return emptyList()
     val nameList: List<String> =
       carrierConfig
         .getStringArray(CarrierConfigManager.KEY_CARRIER_SERVICE_NAME_STRING_ARRAY)