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

Commit 62283fdd authored by sqian's avatar sqian Committed by android-build-merger
Browse files

Merge "Make SubscriptionManager.isValidSubscriptionId public" am: 241aa86e am: 7dc07399 

am: bd4b8796

Change-Id: I28d119d30bc48347715f6c0fe3efdb121a3e2340
parents aa9e1bc1 bd4b8796

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -42654,6 +42654,7 @@ package android.telephony { 
    method public static int[] getSubscriptionIds(int);

    method public java.util.List<android.telephony.SubscriptionPlan> 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);

telephony/java/android/telephony/SubscriptionManager.java

+7 −5
Original line number Diff line number Diff line
@@ -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;

    }



    /**