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

Commit 80496e96 authored by Jayachandran Chinnakkannu's avatar Jayachandran Chinnakkannu Committed by Gerrit Code Review
Browse files

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

parents 2f7b3510 9ecb50e4

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -44947,6 +44947,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
@@ -3228,13 +3228,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 {