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

Commit aaac2b7a authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fix Kotlin safety build error" into main

parents 5a9598a4 12e76919

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)