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

Commit 596e5553 authored by Shivakumar Neginal's avatar Shivakumar Neginal Committed by Automerger Merge Worker
Browse files

Merge "[eSIM] Get sim state for active port index instead of... 

Merge "[eSIM] Get sim state for active port index instead of DEFAULT_PORT_INDEX 0." into tm-dev am: 9d37dae0

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17630455



Change-Id: I2d81ace9cf2ef4c7b7ca4dc1acd2a52037b9b94f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 97095140 9d37dae0

telephony/java/android/telephony/TelephonyManager.java

+4 −2
Original line number Diff line number Diff line
@@ -3584,7 +3584,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);

    }










@@ -3690,9 +3691,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);















    }