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

Commit 05d1ed18 authored Feb 25, 2020 by Malcolm Chen

Mark NonNull for canManageSubscription parameters.

Bug: 148106947
Test: build
Change-Id: I56dc7576c9b44337f0b61164a5cd434d17601ccb
Merged-In: I56dc7576c9b44337f0b61164a5cd434d17601ccb

parent dc4985f4

api/system-current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);

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;
		}