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 am: f402732eab am: 69a0e88bd9

Browse Source 
Change-Id: Ic942abdb41ea8bee60c2db339d0e2d82485190af
This commit is contained in:
Automerger Merge Worker
2020-02-28 23:00:53 +00:00
parent 7c40c1ebe8 69a0e88bd9
commit 0252c4e5b0
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

@@ -11600,7 +11600,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;
} }