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

Merge "Mark two unfinished APIs as "DO NOT USE"." into qt-dev

Browse Source 
am: a8a95549ff

Change-Id: I19e2e8b28d9be380c233749d04108f436a3e7ae6
This commit is contained in:
Malcolm Chen
2019-06-18 20:29:48 -07:00
committed by android-build-merger
parent af525e99b2 a8a95549ff
commit c95eecca78
1 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3070,18 +3070,10 @@ public class SubscriptionManager {
}
/**
* Returns whether the subscription is enabled or not. This is different from activated
* or deactivated for two aspects. 1) For when user disables a physical subscription, we
* actually disable the modem because we can't switch off the subscription. 2) For eSIM,
* user may enable one subscription but the system may activate another temporarily. In this
* case, user enabled one is different from current active one.
* @param subscriptionId The subscription it asks about.
* @return whether it's enabled or not. {@code true} if user set this subscription enabled
* earlier, or user never set subscription enable / disable on this slot explicitly, and
* this subscription is currently active. Otherwise, it returns {@code false}.
*
* DO NOT USE.
* This API is designed for features that are not finished at this point. Do not call this API.
* @hide
* TODO b/135547512: further clean up
*/
@SystemApi
@RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
@@ -3099,14 +3091,10 @@ public class SubscriptionManager {
}
/**
* Get which subscription is enabled on this slot. See {@link #isSubscriptionEnabled(int)}
* for more details.
*
* @param slotIndex which slot it asks about.
* @return which subscription is enabled on this slot. If there's no enabled subscription
* in this slot, it will return {@link SubscriptionManager#INVALID_SUBSCRIPTION_ID}.
*
* DO NOT USE.
* This API is designed for features that are not finished at this point. Do not call this API.
* @hide
* TODO b/135547512: further clean up
*/
@SystemApi
@RequiresPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE)