Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 80496e96e4

Change-Id: Ib0b919b294207cbc7c7b4333f7e6f9989bb44e45
This commit is contained in:
Jayachandran Chinnakkannu
2019-11-14 10:52:55 -08:00
committed by android-build-merger
parent 15b30f03f4 80496e96e4
commit 74c9a01da2
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -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 @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 @Deprecated public static android.telephony.SubscriptionManager from(android.content.Context);
method public java.util.List<android.telephony.SubscriptionInfo> getAccessibleSubscriptionInfoList(); 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 android.telephony.SubscriptionInfo getActiveSubscriptionInfo(int);
method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public int getActiveSubscriptionInfoCount(); method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public int getActiveSubscriptionInfoCount();
method public int getActiveSubscriptionInfoCountMax(); method public int getActiveSubscriptionInfoCountMax();

11
telephony/java/android/telephony/SubscriptionManager.java
View File

@@ -3229,13 +3229,14 @@ public class SubscriptionManager {
} }
/** /**
* Get active data subscription id. * 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
*
* See {@link PhoneStateListener#onActiveDataSubscriptionIdChanged(int)} for the details. * See {@link PhoneStateListener#onActiveDataSubscriptionIdChanged(int)} for the details.
* *
* @return Active data subscription id * @return Active data subscription id if any is chosen, or
* * SubscriptionManager.INVALID_SUBSCRIPTION_ID if not.
* //TODO: Refactor this API in b/134702460
* @hide
*/ */
public static int getActiveDataSubscriptionId() { public static int getActiveDataSubscriptionId() {
try { try {