diff options
| -rwxr-xr-x | api/current.txt | 2 | ||||
| -rw-r--r-- | telephony/java/android/telephony/SubscriptionManager.java | 19 |
2 files changed, 11 insertions, 10 deletions
diff --git a/api/current.txt b/api/current.txt index aca5e5194290..1f29fcb0ceb5 100755 --- a/api/current.txt +++ b/api/current.txt @@ -42636,6 +42636,7 @@ package android.telephony { method public static int getDefaultSmsSubscriptionId(); method public static int getDefaultSubscriptionId(); method public static int getDefaultVoiceSubscriptionId(); + method public static int getSlotIndex(int); method public static int[] getSubscriptionIds(int); method public java.util.List<android.telephony.SubscriptionInfo> getOpportunisticSubscriptions(int); method public java.util.List<android.telephony.SubscriptionPlan> getSubscriptionPlans(int); @@ -42657,6 +42658,7 @@ package android.telephony { field public static final int DATA_ROAMING_ENABLE = 1; // 0x1 field public static final int DEFAULT_SUBSCRIPTION_ID = 2147483647; // 0x7fffffff field public static final java.lang.String EXTRA_SUBSCRIPTION_INDEX = "android.telephony.extra.SUBSCRIPTION_INDEX"; + field public static final int INVALID_SIM_SLOT_INDEX = -1; // 0xffffffff field public static final int INVALID_SUBSCRIPTION_ID = -1; // 0xffffffff } diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java index 876655c44cdb..dfe35cdf3568 100644 --- a/telephony/java/android/telephony/SubscriptionManager.java +++ b/telephony/java/android/telephony/SubscriptionManager.java @@ -88,8 +88,7 @@ public class SubscriptionManager { /** @hide */ public static final int INVALID_PHONE_INDEX = -1; - /** An invalid slot identifier */ - /** @hide */ + /** Indicates invalid sim slot. This can be returned by {@link #getSlotIndex(int)}. */ public static final int INVALID_SIM_SLOT_INDEX = -1; /** Indicates the default subscription ID in Telephony. */ @@ -1310,15 +1309,15 @@ public class SubscriptionManager { /** * Get slotIndex associated with the subscription. - * @return slotIndex as a positive integer or a negative value if an error either - * SIM_NOT_INSERTED or < 0 if an invalid slot index - * @hide + * + * @param subscriptionId the unique SubscriptionInfo index in database + * @return slotIndex as a positive integer or {@link #INVALID_SIM_SLOT_INDEX} if the supplied + * subscriptionId doesn't have an associated slot index. */ - @UnsupportedAppUsage - public static int getSlotIndex(int subId) { - if (!isValidSubscriptionId(subId)) { + public static int getSlotIndex(int subscriptionId) { + if (!isValidSubscriptionId(subscriptionId)) { if (DBG) { - logd("[getSlotIndex]- fail"); + logd("[getSlotIndex]- supplied subscriptionId is invalid."); } } @@ -1327,7 +1326,7 @@ public class SubscriptionManager { try { ISub iSub = ISub.Stub.asInterface(ServiceManager.getService("isub")); if (iSub != null) { - result = iSub.getSlotIndex(subId); + result = iSub.getSlotIndex(subscriptionId); } } catch (RemoteException ex) { // ignore it |