commit 12e76919ef040864cf7e2e4a32081d91a698ea91
author bianfang.guo <bianfang.guo@mediatek.com> Mon Dec 04 10:02:04 2023 +0800
committer Jaw Wei Chi <muga.chi@mediatek.com> Wed Dec 13 03:24:12 2023 +0000
tree 06fbe210dc945b47c28b3f15230cb61de876a4a9
parent 5a9598a4f7b6df117b1a839c03b8e04937cc9212

Fix Kotlin safety build error

Handle nullable in kotlin to avoid build error.

Bug: 314709820
Change-Id: I05b2824e3a5e4ec0dfe79d7c91fdfe8700ec1516

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)