Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e328fcd8 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix Kotlin safety build error" into main am: aaac2b7a am: 019284b5 

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



Change-Id: I4ee468876efc016301dfe6b99709afa74eef0e50
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6f6f0eb6 019284b5

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

+2 −2
Original line number Diff line number Diff line
@@ -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)