From aec82325210cc83e9b280f582bfe226a883db847 Mon Sep 17 00:00:00 2001 From: Peter Cai Date: Mon, 25 Dec 2023 20:40:40 -0500 Subject: [PATCH 1/2] OpenEuiccService: check all ports before deleting a profile --- .../openeuicc/core/EuiccChannelManager.kt | 10 +++++++ .../openeuicc/service/OpenEuiccService.kt | 26 ++++++++++++------- 2 files changed, 26 insertions(+), 10 deletions(-) diff --git a/app-common/src/main/java/im/angry/openeuicc/core/EuiccChannelManager.kt b/app-common/src/main/java/im/angry/openeuicc/core/EuiccChannelManager.kt index 0657c98..59c3aa9 100644 --- a/app-common/src/main/java/im/angry/openeuicc/core/EuiccChannelManager.kt +++ b/app-common/src/main/java/im/angry/openeuicc/core/EuiccChannelManager.kt @@ -135,6 +135,16 @@ open class EuiccChannelManager(protected val context: Context) { } } + fun findAllEuiccChannelsByPhysicalSlotBlocking(physicalSlotId: Int): List? = runBlocking { + if (!checkPrivileges()) return@runBlocking null + for (card in tm.uiccCardsInfoCompat) { + if (card.physicalSlotIndex != physicalSlotId) continue + return@runBlocking card.ports.mapNotNull { tryOpenEuiccChannel(it) } + .ifEmpty { null } + } + return@runBlocking null + } + fun findEuiccChannelByPortBlocking(physicalSlotId: Int, portId: Int): EuiccChannel? = runBlocking { if (!checkPrivileges()) return@runBlocking null withContext(Dispatchers.IO) { diff --git a/app/src/main/java/im/angry/openeuicc/service/OpenEuiccService.kt b/app/src/main/java/im/angry/openeuicc/service/OpenEuiccService.kt index d98fca8..cba4bc8 100644 --- a/app/src/main/java/im/angry/openeuicc/service/OpenEuiccService.kt +++ b/app/src/main/java/im/angry/openeuicc/service/OpenEuiccService.kt @@ -27,6 +27,10 @@ class OpenEuiccService : EuiccService() { openEuiccApplication.euiccChannelManager .findEuiccChannelByPortBlocking(slotId, portId) + private fun findAllChannels(physicalSlotId: Int): List? = + openEuiccApplication.euiccChannelManager + .findAllEuiccChannelsByPhysicalSlotBlocking(physicalSlotId) + override fun onGetEid(slotId: Int): String? = findChannel(slotId)?.lpa?.eID @@ -141,23 +145,25 @@ class OpenEuiccService : EuiccService() { override fun onDeleteSubscription(slotId: Int, iccid: String): Int { Log.i(TAG, "onDeleteSubscription slotId=$slotId iccid=$iccid") try { - val channel = findChannel(slotId) ?: return RESULT_FIRST_USER + val channels = findAllChannels(slotId) ?: return RESULT_FIRST_USER - if (!channel.profileExists(iccid)) { + if (!channels[0].profileExists(iccid)) { return RESULT_FIRST_USER } - val profile = channel.lpa.profiles.find { - it.iccid == iccid - } ?: return RESULT_FIRST_USER + // If the profile is enabled by ANY channel (port), we cannot delete it + channels.forEach { channel -> + val profile = channel.lpa.profiles.find { + it.iccid == iccid + } ?: return RESULT_FIRST_USER - if (profile.state == LocalProfileInfo.State.Enabled) { - // Must disable the profile first - // TODO: Need to check "other port" as well for MEP - return RESULT_FIRST_USER + if (profile.state == LocalProfileInfo.State.Enabled) { + // Must disable the profile first + return RESULT_FIRST_USER + } } - return if (channel.lpa.deleteProfile(iccid)) { + return if (channels[0].lpa.deleteProfile(iccid)) { RESULT_OK } else { RESULT_FIRST_USER From d4b875c808cc2ae96299dadc544202681422bcdc Mon Sep 17 00:00:00 2001 From: Peter Cai Date: Mon, 25 Dec 2023 21:33:19 -0500 Subject: [PATCH 2/2] SlotMappingFragment: Disable profiles on unmapped slots --- .../angry/openeuicc/ui/SlotMappingFragment.kt | 4 ++- .../util/PrivilegedTelephonyUtils.kt | 31 +++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/im/angry/openeuicc/ui/SlotMappingFragment.kt b/app/src/main/java/im/angry/openeuicc/ui/SlotMappingFragment.kt index 2816153..57d39c7 100644 --- a/app/src/main/java/im/angry/openeuicc/ui/SlotMappingFragment.kt +++ b/app/src/main/java/im/angry/openeuicc/ui/SlotMappingFragment.kt @@ -98,7 +98,9 @@ class SlotMappingFragment: DialogFragment(), OnMenuItemClickListener { lifecycleScope.launch(Dispatchers.Main) { try { withContext(Dispatchers.IO) { - tm.simSlotMapping = adapter.mappings + // Use the utility method from PrivilegedTelephonyUtils to ensure + // unmapped ports have all profiles disabled + tm.updateSimSlotMapping(openEuiccApplication.euiccChannelManager, adapter.mappings) } } catch (e: Exception) { Toast.makeText(requireContext(), R.string.slot_mapping_failure, Toast.LENGTH_LONG).show() diff --git a/app/src/main/java/im/angry/openeuicc/util/PrivilegedTelephonyUtils.kt b/app/src/main/java/im/angry/openeuicc/util/PrivilegedTelephonyUtils.kt index 28b9623..a875d8a 100644 --- a/app/src/main/java/im/angry/openeuicc/util/PrivilegedTelephonyUtils.kt +++ b/app/src/main/java/im/angry/openeuicc/util/PrivilegedTelephonyUtils.kt @@ -2,6 +2,9 @@ package im.angry.openeuicc.util import android.telephony.SubscriptionManager import android.telephony.TelephonyManager +import android.telephony.UiccSlotMapping +import im.angry.openeuicc.core.EuiccChannelManager +import net.typeblog.lpac_jni.LocalProfileInfo import java.lang.Exception val TelephonyManager.supportsDSDS: Boolean @@ -13,6 +16,34 @@ var TelephonyManager.dsdsEnabled: Boolean switchMultiSimConfig(if (value) { 2 } else {1}) } +// Disable eSIM profiles before switching the slot mapping +// This ensures that unmapped eSIM ports never have "ghost" profiles enabled +fun TelephonyManager.updateSimSlotMapping(euiccManager: EuiccChannelManager, newMapping: Collection) { + val unmapped = simSlotMapping.filterNot { mapping -> + // If the same physical slot + port pair is not found in the new mapping, it is unmapped + newMapping.any { + it.physicalSlotIndex == mapping.physicalSlotIndex && it.portIndex == mapping.portIndex + } + } + + val undo = unmapped.mapNotNull { mapping -> + euiccManager.findEuiccChannelByPortBlocking(mapping.physicalSlotIndex, mapping.portIndex)?.let { channel -> + channel.lpa.profiles.find { it.state == LocalProfileInfo.State.Enabled }?.let { profile -> + channel.lpa.disableProfile(profile.iccid) + return@mapNotNull { channel.lpa.enableProfile(profile.iccid) } + } + } + } + + try { + simSlotMapping = newMapping + } catch (e: Exception) { + e.printStackTrace() + undo.forEach { it() } // Undo what we just did + throw e // Rethrow for caller to handle + } +} + fun SubscriptionManager.tryRefreshCachedEuiccInfo(cardId: Int) { if (cardId != 0) { try {