diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 92cabab06134f..fc081611052eb 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -3582,7 +3582,8 @@ public class TelephonyManager { @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) @Deprecated public @SimState int getSimCardState(int physicalSlotIndex) { - int simState = getSimState(getLogicalSlotIndex(physicalSlotIndex, DEFAULT_PORT_INDEX)); + int activePort = getFirstActivePortIndex(physicalSlotIndex); + int simState = getSimState(getLogicalSlotIndex(physicalSlotIndex, activePort)); return getSimCardStateFromSimState(simState); } @@ -3688,9 +3689,10 @@ public class TelephonyManager { @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) @Deprecated public @SimState int getSimApplicationState(int physicalSlotIndex) { + int activePort = getFirstActivePortIndex(physicalSlotIndex); int simState = SubscriptionManager.getSimStateForSlotIndex(getLogicalSlotIndex(physicalSlotIndex, - DEFAULT_PORT_INDEX)); + activePort)); return getSimApplicationStateFromSimState(simState); }