Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make TelephonyManager APIs public:"

Browse Source 
am: 441bfc6718

Change-Id: I968c8232c746027123beac6481161019e1dc64a5
This commit is contained in:
Polina Bondarenko
2016-12-16 10:37:21 +00:00
committed by android-build-merger
parent 29d7284285 441bfc6718
commit 104a5c7a34
4 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
api/current.txt
View File

@@ -37465,6 +37465,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();
@@ -37547,7 +37548,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

5
api/system-current.txt
View File

@@ -40631,6 +40631,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();
@@ -40744,7 +40745,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

5
api/test-current.txt
View File

@@ -37547,6 +37547,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();
@@ -37629,7 +37630,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

16
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -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;