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

Commit a6dba0ab authored by Polina Bondarenko's avatar Polina Bondarenko
Browse files

Make TelephonyManager APIs public: 

TelephonyManager.getSimState(slotIdx) and
TelephonyManager.SIM_STATE_CARD_RESTRICTED.

It is needed for OobConfig app unbundling.

Bug: 33479833
Test: run cts -m CtsTelephonyTestCases
Change-Id: I375f436bc4e1dcedc0656866a0838c7bf5948422
parent d7b144a5

api/current.txt

+5 −0
Original line number Diff line number Diff line
@@ -37411,6 +37411,7 @@ package android.telephony { 
    method public java.lang.String getSimOperatorName();

    method public java.lang.String getSimSerialNumber();

    method public int getSimState();

    method public int getSimState(int);

    method public java.lang.String getSubscriberId();

    method public java.lang.String getVoiceMailAlphaTag();

    method public java.lang.String getVoiceMailNumber();
@@ -37493,7 +37494,11 @@ package android.telephony { 
    field public static final int PHONE_TYPE_NONE = 0; // 0x0

    field public static final int PHONE_TYPE_SIP = 3; // 0x3

    field public static final int SIM_STATE_ABSENT = 1; // 0x1

    field public static final int SIM_STATE_CARD_IO_ERROR = 8; // 0x8

    field public static final int SIM_STATE_CARD_RESTRICTED = 9; // 0x9

    field public static final int SIM_STATE_NETWORK_LOCKED = 4; // 0x4

    field public static final int SIM_STATE_NOT_READY = 6; // 0x6

    field public static final int SIM_STATE_PERM_DISABLED = 7; // 0x7

    field public static final int SIM_STATE_PIN_REQUIRED = 2; // 0x2

    field public static final int SIM_STATE_PUK_REQUIRED = 3; // 0x3

    field public static final int SIM_STATE_READY = 5; // 0x5

api/system-current.txt

+5 −0
Original line number Diff line number Diff line
@@ -40572,6 +40572,7 @@ package android.telephony { 
    method public java.lang.String getSimOperatorName();

    method public java.lang.String getSimSerialNumber();

    method public int getSimState();

    method public int getSimState(int);

    method public java.lang.String getSubscriberId();

    method public java.util.List<android.telephony.TelephonyHistogram> getTelephonyHistograms();

    method public java.lang.String getVoiceMailAlphaTag();
@@ -40685,7 +40686,11 @@ package android.telephony { 
    field public static final int SIM_ACTIVATION_RESULT_IN_PROGRESS = 2; // 0x2

    field public static final int SIM_ACTIVATION_RESULT_NOT_SUPPORTED = 1; // 0x1

    field public static final int SIM_STATE_ABSENT = 1; // 0x1

    field public static final int SIM_STATE_CARD_IO_ERROR = 8; // 0x8

    field public static final int SIM_STATE_CARD_RESTRICTED = 9; // 0x9

    field public static final int SIM_STATE_NETWORK_LOCKED = 4; // 0x4

    field public static final int SIM_STATE_NOT_READY = 6; // 0x6

    field public static final int SIM_STATE_PERM_DISABLED = 7; // 0x7

    field public static final int SIM_STATE_PIN_REQUIRED = 2; // 0x2

    field public static final int SIM_STATE_PUK_REQUIRED = 3; // 0x3

    field public static final int SIM_STATE_READY = 5; // 0x5

api/test-current.txt

+5 −0
Original line number Diff line number Diff line
@@ -37493,6 +37493,7 @@ package android.telephony { 
    method public java.lang.String getSimOperatorName();

    method public java.lang.String getSimSerialNumber();

    method public int getSimState();

    method public int getSimState(int);

    method public java.lang.String getSubscriberId();

    method public java.lang.String getVoiceMailAlphaTag();

    method public java.lang.String getVoiceMailNumber();
@@ -37575,7 +37576,11 @@ package android.telephony { 
    field public static final int PHONE_TYPE_NONE = 0; // 0x0

    field public static final int PHONE_TYPE_SIP = 3; // 0x3

    field public static final int SIM_STATE_ABSENT = 1; // 0x1

    field public static final int SIM_STATE_CARD_IO_ERROR = 8; // 0x8

    field public static final int SIM_STATE_CARD_RESTRICTED = 9; // 0x9

    field public static final int SIM_STATE_NETWORK_LOCKED = 4; // 0x4

    field public static final int SIM_STATE_NOT_READY = 6; // 0x6

    field public static final int SIM_STATE_PERM_DISABLED = 7; // 0x7

    field public static final int SIM_STATE_PIN_REQUIRED = 2; // 0x2

    field public static final int SIM_STATE_PUK_REQUIRED = 3; // 0x3

    field public static final int SIM_STATE_READY = 5; // 0x5

telephony/java/android/telephony/TelephonyManager.java

+5 −11
Original line number Diff line number Diff line
@@ -1824,21 +1824,14 @@ public class TelephonyManager { 
    public static final int SIM_STATE_NETWORK_LOCKED = 4;

    /** SIM card state: Ready */

    public static final int SIM_STATE_READY = 5;

    /** SIM card state: SIM Card is NOT READY

     *@hide

     */

    /** SIM card state: SIM Card is NOT READY */

    public static final int SIM_STATE_NOT_READY = 6;

    /** SIM card state: SIM Card Error, permanently disabled

     *@hide

     */

    /** SIM card state: SIM Card Error, permanently disabled */

    public static final int SIM_STATE_PERM_DISABLED = 7;

    /** SIM card state: SIM Card Error, present but faulty

     *@hide

     */

    /** SIM card state: SIM Card Error, present but faulty */

    public static final int SIM_STATE_CARD_IO_ERROR = 8;

    /** SIM card state: SIM Card restricted, present but not usable due to

     * carrier restrictions.

     *@hide

     */

    public static final int SIM_STATE_CARD_RESTRICTED = 9;
@@ -1884,6 +1877,7 @@ public class TelephonyManager { 
     * @see #SIM_STATE_NOT_READY

     * @see #SIM_STATE_PERM_DISABLED

     * @see #SIM_STATE_CARD_IO_ERROR

     * @see #SIM_STATE_CARD_RESTRICTED

     */

    public int getSimState() {

        int slotIdx = getDefaultSim();
@@ -1921,8 +1915,8 @@ public class TelephonyManager { 
     * @see #SIM_STATE_NOT_READY

     * @see #SIM_STATE_PERM_DISABLED

     * @see #SIM_STATE_CARD_IO_ERROR

     * @see #SIM_STATE_CARD_RESTRICTED

     */

    /** {@hide} */

    public int getSimState(int slotIdx) {

        int simState = SubscriptionManager.getSimStateForSlotIdx(slotIdx);

        return simState;