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

Merge "[Mainline] Make canManageSubscription(SubscriptionInfo, String) System API."

Browse Source
This commit is contained in:
Xiangyu/Malcolm Chen
2019-12-30 23:37:14 +00:00
committed by Android (Google) Code Review
parent fe00ebe1a1 35b249226b
commit 70fa436b2a
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/system-current.txt
View File

@@ -9903,6 +9903,7 @@ package android.telephony {
public class SubscriptionManager {
method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean canDisablePhysicalSubscription();
method public boolean canManageSubscription(@Nullable android.telephony.SubscriptionInfo, @Nullable String);
method public java.util.List<android.telephony.SubscriptionInfo> getAvailableSubscriptionInfoList();
method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int getEnabledSubscriptionId(int);
method @NonNull public static android.content.res.Resources getResourcesForSubId(@NonNull android.content.Context, int);

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

@@ -2655,8 +2655,7 @@ public class SubscriptionManager {
/**
* Checks whether the app with the given context is authorized to manage the given subscription
* according to its metadata. Only supported for embedded subscriptions (if
* {@code SubscriptionInfo#isEmbedded} returns true).
* according to its metadata.
*
* @param info The subscription to check.
* @return whether the app is authorized to manage this subscription per its metadata.
@@ -2669,16 +2668,16 @@ public class SubscriptionManager {
* Checks whether the given app is authorized to manage the given subscription. An app can only
* be authorized if it is included in the {@link android.telephony.UiccAccessRule} of the
* {@link android.telephony.SubscriptionInfo} with the access status.
* Only supported for embedded subscriptions (if {@link SubscriptionInfo#isEmbedded}
* returns true).
*
* @param info The subscription to check.
* @param packageName Package name of the app to check.
* @return whether the app is authorized to manage this subscription per its access rules.
* @hide
*/
public boolean canManageSubscription(SubscriptionInfo info, String packageName) {
if (info == null || info.getAllAccessRules() == null) {
@SystemApi
public boolean canManageSubscription(@Nullable SubscriptionInfo info,
@Nullable String packageName) {
if (info == null || info.getAllAccessRules() == null || packageName == null) {
return false;
}
PackageManager packageManager = mContext.getPackageManager();