eSIM deprecated API test Refactoring

Test: build Bug: 159354974 Change-Id: Iedeb90f186ab9f82894e2fecef86d339c8989542
2021-09-30 09:09:59 +00:00
parent 666d0984d4
commit 40ffe69a3e
8 changed files with 165 additions and 55 deletions
--- a/src/com/android/settings/network/telephony/ToggleSubscriptionDialogActivity.java
+++ b/src/com/android/settings/network/telephony/ToggleSubscriptionDialogActivity.java
@@ -484,7 +484,8 @@ public class ToggleSubscriptionDialogActivity extends SubscriptionActionDialogAc
                                slot ->
                                        slot != null
                                                && slot.isRemovable()
-                                                && slot.getIsActive()
+                                                && slot.getPorts().stream().anyMatch(
+                                                        port -> port.isActive())
                                                && slot.getCardStateInfo()
                                                        == UiccSlotInfo.CARD_STATE_INFO_PRESENT);
        if (mIsEsimOperation && isRemovableSimEnabled) {
@@ -498,7 +499,7 @@ public class ToggleSubscriptionDialogActivity extends SubscriptionActionDialogAc
            Log.i(
                    TAG,
                    "Removable SIM operation and eSIM profile is enabled. DSDS condition"
-                        + " satisfied.");
+                            + " satisfied.");
            return true;
        }
        Log.i(TAG, "DSDS condition not satisfied.");