commit e328fcd8cfb88f378dd9ac095b3d3cace7f4367d
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Dec 14 01:04:54 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Dec 14 01:04:54 2023 +0000
tree 06fbe210dc945b47c28b3f15230cb61de876a4a9
parent 6f6f0eb66cd0d46249904190f770d73c6543c25d
parent 019284b53ef83e3e6db4020a69951964883afa0e

Merge "Fix Kotlin safety build error" into main am: aaac2b7a94 am: 019284b53e

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Contacts/+/2857005

Change-Id: I4ee468876efc016301dfe6b99709afa74eef0e50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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)