Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de3b8282 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Mark NonNull for canManageSubscription parameters." am: ae4ad59c 

Change-Id: I1520a4e630f49bdeaeccff1ff0165407ae899934
parents 39b1ffa0 ae4ad59c

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -9272,7 +9272,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);

























telephony/java/android/telephony/SubscriptionManager.java



+2
−2






























Original line number
Diff line number
Diff line








@@ -2680,8 +2680,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;















        }