Merge "Fixed incorrect permission check" into main (34c706fb) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/SubscriptionManager.java

+5 −1

Original line number	Diff line number	Diff line
		@@ -4821,10 +4821,14 @@ public class SubscriptionManager {
		+ "Invalid subscriptionId: " + subscriptionId);
		}

		String contextPkg = mContext != null ? mContext.getOpPackageName() : "<unknown>";
		String contextAttributionTag = mContext != null ? mContext.getAttributionTag() : null;

		try {
		ISub iSub = TelephonyManager.getSubscriptionService();
		if (iSub != null) {
		return iSub.isSubscriptionAssociatedWithCallingUser(subscriptionId);
		return iSub.isSubscriptionAssociatedWithCallingUser(subscriptionId, contextPkg,
		contextAttributionTag);
		} else {
		throw new IllegalStateException("subscription service unavailable.");
		}

+5 −1

Original line number	Diff line number	Diff line
		@@ -347,13 +347,17 @@ interface ISub {
		* Returns whether the given subscription is associated with the calling user.
		*
		* @param subscriptionId the subscription ID of the subscription
		* @param callingPackage The package maing the call
		* @param callingFeatureId The feature in the package

		* @return {@code true} if the subscription is associated with the user that the current process
		* is running in; {@code false} otherwise.
		*
		* @throws IllegalArgumentException if subscription doesn't exist.
		* @throws SecurityException if the caller doesn't have permissions required.
		*/
		boolean isSubscriptionAssociatedWithCallingUser(int subscriptionId);
		boolean isSubscriptionAssociatedWithCallingUser(int subscriptionId, String callingPackage,
		String callingFeatureId);

		/**
		* Check if subscription and user are associated with each other.