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

am eb4de876: Merge "Update API and documentation for invalid subscriptions id\'s" into lmp-mr1-dev

Browse Source 
* commit 'eb4de87683a0d1959d64af08f3685e1b3701a314':
  Update API and documentation for invalid subscriptions id's
This commit is contained in:
Wink Saville
2014-12-10 18:01:31 +00:00
committed by Android Git Automerger
parent 7557ec128f eb4de87683
commit afd6f5a37e
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -28651,7 +28651,6 @@ package android.telephony {
method public boolean isNetworkRoaming(int); method public boolean isNetworkRoaming(int);
method public void registerOnSubscriptionsChangedListener(android.telephony.SubscriptionManager.OnSubscriptionsChangedListener); method public void registerOnSubscriptionsChangedListener(android.telephony.SubscriptionManager.OnSubscriptionsChangedListener);
method public void unregisterOnSubscriptionsChangedListener(android.telephony.SubscriptionManager.OnSubscriptionsChangedListener); method public void unregisterOnSubscriptionsChangedListener(android.telephony.SubscriptionManager.OnSubscriptionsChangedListener);
field public static final int INVALID_SUBSCRIPTION_ID = -1; // 0xffffffff
} }
public static class SubscriptionManager.OnSubscriptionsChangedListener { public static class SubscriptionManager.OnSubscriptionsChangedListener {

11
telephony/java/android/telephony/SubscriptionManager.java
View File

@@ -52,6 +52,7 @@ public class SubscriptionManager {
private static final boolean VDBG = false; private static final boolean VDBG = false;
/** An invalid subscription identifier */ /** An invalid subscription identifier */
/** @hide */
public static final int INVALID_SUBSCRIPTION_ID = -1; public static final int INVALID_SUBSCRIPTION_ID = -1;
/** Base value for Dummy SUBSCRIPTION_ID's. */ /** Base value for Dummy SUBSCRIPTION_ID's. */
@@ -662,7 +663,7 @@ public class SubscriptionManager {
* @param subId the unique SubscriptionInfo index in database * @param subId the unique SubscriptionInfo index in database
* @param nameSource 0: NAME_SOURCE_DEFAULT_SOURCE, 1: NAME_SOURCE_SIM_SOURCE, * @param nameSource 0: NAME_SOURCE_DEFAULT_SOURCE, 1: NAME_SOURCE_SIM_SOURCE,
* 2: NAME_SOURCE_USER_INPUT, -1 NAME_SOURCE_UNDEFINED * 2: NAME_SOURCE_USER_INPUT, -1 NAME_SOURCE_UNDEFINED
* @return the number of records updated or -1 if invalid subId * @return the number of records updated or < 0 if invalid subId
* @hide * @hide
*/ */
public int setDisplayName(String displayName, int subId, long nameSource) { public int setDisplayName(String displayName, int subId, long nameSource) {
@@ -749,7 +750,7 @@ public class SubscriptionManager {
/** /**
* Get slotId associated with the subscription. * Get slotId associated with the subscription.
* @return slotId as a positive integer or a negative value if an error either * @return slotId as a positive integer or a negative value if an error either
* SIM_NOT_INSERTED or INVALID_SLOT_ID. * SIM_NOT_INSERTED or < 0 if an invalid slot index
* @hide * @hide
*/ */
public static int getSlotId(int subId) { public static int getSlotId(int subId) {
@@ -884,7 +885,7 @@ public class SubscriptionManager {
/** /**
* @return subId of the DefaultSms subscription or * @return subId of the DefaultSms subscription or
* the value INVALID_SUBSCRIPTION_ID if an error. * a value < 0 if an error.
* *
* @hide * @hide
*/ */
@@ -998,7 +999,7 @@ public class SubscriptionManager {
/** /**
* If a default is set to subscription which is not active, this will reset that default back to * If a default is set to subscription which is not active, this will reset that default back to
* INVALID_SUBSCRIPTION_ID. * an invalid subscription id, i.e. < 0.
* @hide * @hide
*/ */
public void clearDefaultsForInactiveSubIds() { public void clearDefaultsForInactiveSubIds() {
@@ -1023,7 +1024,7 @@ public class SubscriptionManager {
/** /**
* @return true if subId is an usable subId value else false. A * @return true if subId is an usable subId value else false. A
* usable subId means its neither a INVALID_SUBSCRIPTION_ID nor a DEFAUL_SUB_ID. * usable subId means its neither a INVALID_SUBSCRIPTION_ID nor a DEFAULT_SUB_ID.
* @hide * @hide
*/ */
public static boolean isUsableSubIdValue(int subId) { public static boolean isUsableSubIdValue(int subId) {