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

Commit c518a2fe authored by Jayachandran Chinnakkannu's avatar Jayachandran Chinnakkannu Committed by android-build-merger
Browse files

Merge "Expose SubscriptionManager.getActiveDataSubscriptionId() as public API"... 

Merge "Expose SubscriptionManager.getActiveDataSubscriptionId() as public API" am: 80496e96 am: 74c9a01d
am: 4386a980

Change-Id: Ic849083c4816c11e52e0586342c1602862fb46e4
parents 9f43c201 4386a980

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -45231,6 +45231,7 @@ package android.telephony { 
    method @NonNull @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public android.os.ParcelUuid createSubscriptionGroup(@NonNull java.util.List<java.lang.Integer>);

    method @Deprecated public static android.telephony.SubscriptionManager from(android.content.Context);

    method public java.util.List<android.telephony.SubscriptionInfo> getAccessibleSubscriptionInfoList();

    method public static int getActiveDataSubscriptionId();

    method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public android.telephony.SubscriptionInfo getActiveSubscriptionInfo(int);

    method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public int getActiveSubscriptionInfoCount();

    method public int getActiveSubscriptionInfoCountMax();

telephony/java/android/telephony/SubscriptionManager.java

+6 −5
Original line number Diff line number Diff line
@@ -3182,13 +3182,14 @@ public class SubscriptionManager { 
    }



    /**

     * Get active data subscription id.

     * See {@link PhoneStateListener#onActiveDataSubscriptionIdChanged(int)} for the details.

     * Get active data subscription id. Active data subscription refers to the subscription

     * currently chosen to provide cellular internet connection to the user. This may be

     * different from getDefaultDataSubscriptionId(). Eg. Opportunistics data

     *

     * @return Active data subscription id

     * See {@link PhoneStateListener#onActiveDataSubscriptionIdChanged(int)} for the details.

     *

     * //TODO: Refactor this API in b/134702460

     * @hide

     * @return Active data subscription id if any is chosen, or

     * SubscriptionManager.INVALID_SUBSCRIPTION_ID if not.

     */

    public static int getActiveDataSubscriptionId() {

        try {