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

Merge "Mark NonNull for canManageSubscription parameters." into rvc-dev am: 5f3331df90

Browse Source 
Change-Id: I66f5854efc5933ea5e89316fc04d7950808bdf98
This commit is contained in:
Automerger Merge Worker
2020-02-28 22:33:47 +00:00
parent 1e39c517e9 5f3331df90
commit f402732eab
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/system-current.txt
View File

@@ -11598,7 +11598,7 @@ package android.telephony {
public class SubscriptionManager { public class SubscriptionManager {
method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean canDisablePhysicalSubscription(); method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean canDisablePhysicalSubscription();
method public boolean canManageSubscription(@Nullable android.telephony.SubscriptionInfo, @Nullable String); method public boolean canManageSubscription(@NonNull android.telephony.SubscriptionInfo, @NonNull String);
method @NonNull public int[] getActiveAndHiddenSubscriptionIdList(); method @NonNull public int[] getActiveAndHiddenSubscriptionIdList();
method @NonNull public int[] getActiveSubscriptionIdList(); method @NonNull public int[] getActiveSubscriptionIdList();
method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public android.telephony.SubscriptionInfo getActiveSubscriptionInfoForIcc(@NonNull String); method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public android.telephony.SubscriptionInfo getActiveSubscriptionInfoForIcc(@NonNull String);

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

@@ -2575,8 +2575,8 @@ public class SubscriptionManager {
* @hide * @hide
*/ */
@SystemApi @SystemApi
public boolean canManageSubscription(@Nullable SubscriptionInfo info, public boolean canManageSubscription(@NonNull SubscriptionInfo info,
@Nullable String packageName) { @NonNull String packageName) {
if (info == null || info.getAllAccessRules() == null || packageName == null) { if (info == null || info.getAllAccessRules() == null || packageName == null) {
return false; return false;
} }