From 00dae7e0974f9514d331fd21b608bda35e69ee93 Mon Sep 17 00:00:00 2001 From: sqian Date: Thu, 30 Aug 2018 11:53:14 -0700 Subject: [PATCH] Make SubscriptionManager.isValidSubscriptionId public And rename subId to subscriptionId. Test: Treehugger Bug: 113072551 Change-Id: I4bdf705d7f81bad423ed867972fd1ed7fe5717d0 --- api/current.txt | 1 + .../java/android/telephony/SubscriptionManager.java | 12 +++++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/api/current.txt b/api/current.txt index fe8ee501cde0b..2a1295c1ed025 100755 --- a/api/current.txt +++ b/api/current.txt @@ -42457,6 +42457,7 @@ package android.telephony { method public static int[] getSubscriptionIds(int); method public java.util.List getSubscriptionPlans(int); method public boolean isNetworkRoaming(int); + method public static boolean isValidSubscriptionId(int); method public void removeOnOpportunisticSubscriptionsChangedListener(android.telephony.SubscriptionManager.OnOpportunisticSubscriptionsChangedListener); method public void removeOnSubscriptionsChangedListener(android.telephony.SubscriptionManager.OnSubscriptionsChangedListener); method public void setSubscriptionOverrideCongested(int, boolean, long); diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java index f7c8e0e14529c..0c8280b9e086a 100644 --- a/telephony/java/android/telephony/SubscriptionManager.java +++ b/telephony/java/android/telephony/SubscriptionManager.java @@ -1589,12 +1589,14 @@ public class SubscriptionManager { } /** - * @return true if a valid subId else false - * @hide + * Checks if the supplied subscription ID is valid. + * Note: a valid subscription ID does not necessarily correspond to an active subscription. + * + * @param subscriptionId The subscription ID. + * @return true if the supplied subscriptionId is valid; false otherwise. */ - @UnsupportedAppUsage - public static boolean isValidSubscriptionId(int subId) { - return subId > INVALID_SUBSCRIPTION_ID ; + public static boolean isValidSubscriptionId(int subscriptionId) { + return subscriptionId > INVALID_SUBSCRIPTION_ID; } /**