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

Commit b5bc3952 authored May 27, 2022 by SongFerng Wang Committed by Automerger Merge Worker May 27, 2022

Merge "[MEP] The removale slot can read the esim card" into tm-dev am: a67d5e25 am: e4d42c15

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618753

Change-Id: Ie73fca56e20e0c70230ff6823eba12ff63c208f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 2ff3a054 e4d42c15

src/com/android/settings/network/EnableMultiSimSidecar.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -190,8 +190,7 @@ public class EnableMultiSimSidecar extends AsyncTaskSidecar<Void, Boolean> {
		Set<Integer> activeRemovableLogicalSlotIds = new ArraySet<>();
		for (UiccSlotInfo info : infos) {
		for (UiccPortInfo portInfo :info.getPorts()) {
		if (info != null && portInfo.isActive() && info.isRemovable()
		&& !info.getIsEuicc()) {
		if (info != null && portInfo.isActive() && info.isRemovable()) {
		activeRemovableLogicalSlotIds.add(portInfo.getLogicalSlotIndex());
		}
		}

src/com/android/settings/network/UiccSlotUtil.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -249,7 +249,6 @@ public class UiccSlotUtil {
		if (slotId == INVALID_PHYSICAL_SLOT_ID) {
		for (int i = 0; i < slots.length; i++) {
		if (slots[i].isRemovable()
		&& !slots[i].getIsEuicc()
		&& !slots[i].getPorts().stream().findFirst().get().isActive()
		&& slots[i].getCardStateInfo() != UiccSlotInfo.CARD_STATE_INFO_ERROR
		&& slots[i].getCardStateInfo() != UiccSlotInfo.CARD_STATE_INFO_RESTRICTED) {

src/com/android/settings/network/telephony/ToggleSubscriptionDialogActivity.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -592,7 +592,6 @@ public class ToggleSubscriptionDialogActivity extends SubscriptionActionDialogAc
		.anyMatch(
		slot -> slot != null
		&& slot.isRemovable()
		&& !slot.getIsEuicc()
		&& slot.getPorts().stream().anyMatch(
		port -> port.isActive())
		&& slot.getCardStateInfo()

src/com/android/settings/sim/receivers/SimSlotChangeHandler.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -294,7 +294,7 @@ public class SimSlotChangeHandler {
		return null;
		}
		for (UiccSlotInfo slotInfo : slotInfos) {
		if (slotInfo != null && slotInfo.isRemovable() && !slotInfo.getIsEuicc()) {
		if (slotInfo != null && slotInfo.isRemovable()) {
		return slotInfo;
		}
		}