diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2023-12-14 00:32:38 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-12-14 00:32:38 +0000 |
| commit | 019284b53ef83e3e6db4020a69951964883afa0e (patch) | |
| tree | 06fbe210dc945b47c28b3f15230cb61de876a4a9 | |
| parent | f1d2ffa2db2aa2a243ff341030b6d242092777af (diff) | |
| parent | aaac2b7a9449db65bcf5108d4e4b878d0ecb8f49 (diff) | |
| download | Contacts-019284b53ef83e3e6db4020a69951964883afa0e.tar.gz | |
Merge "Fix Kotlin safety build error" into main am: aaac2b7a94
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Contacts/+/2857005
Change-Id: I8c6dccaa9452c0e774131ef9561cd2d2e7ee06ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | src/com/android/contacts/sdn/SdnRepository.kt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/contacts/sdn/SdnRepository.kt b/src/com/android/contacts/sdn/SdnRepository.kt index 082adebf5..07591270c 100644 --- a/src/com/android/contacts/sdn/SdnRepository.kt +++ b/src/com/android/contacts/sdn/SdnRepository.kt @@ -63,7 +63,7 @@ class SdnRepository constructor(private val context: Context) { @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 @@ class SdnRepository constructor(private val context: Context) { 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) |