From 05d1ed18d5596adaf311a3179bc83fdf9280b955 Mon Sep 17 00:00:00 2001 From: Malcolm Chen Date: Tue, 25 Feb 2020 17:50:05 -0800 Subject: [PATCH] Mark NonNull for canManageSubscription parameters. Bug: 148106947 Test: build Change-Id: I56dc7576c9b44337f0b61164a5cd434d17601ccb Merged-In: I56dc7576c9b44337f0b61164a5cd434d17601ccb --- api/system-current.txt | 2 +- telephony/java/android/telephony/SubscriptionManager.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/api/system-current.txt b/api/system-current.txt index 31322f8384f8b..d48f7a07a5d47 100755 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -9271,7 +9271,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); diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java index d8cebfbef8a4b..1c405918da60e 100644 --- a/telephony/java/android/telephony/SubscriptionManager.java +++ b/telephony/java/android/telephony/SubscriptionManager.java @@ -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; }