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

Mark NonNull for canManageSubscription parameters.

Browse Source 
Bug: 148106947
Test: build
Change-Id: I56dc7576c9b44337f0b61164a5cd434d17601ccb
This commit is contained in:
Malcolm Chen
2020-02-25 17:50:05 -08:00
committed by Xiangyu/Malcolm Chen
parent 6d2586f03f
commit 277a551652
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

@@ -11630,7 +11630,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 boolean canManageSubscription(@NonNull android.telephony.SubscriptionInfo, @NonNull String);
method @NonNull public int[] getActiveAndHiddenSubscriptionIdList();
method @NonNull public int[] getActiveSubscriptionIdList();
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
*/
@SystemApi
public boolean canManageSubscription(@Nullable SubscriptionInfo info,
@Nullable String packageName) {
public boolean canManageSubscription(@NonNull SubscriptionInfo info,
@NonNull String packageName) {
if (info == null || info.getAllAccessRules() == null || packageName == null) {
return false;
}