Snap for 11456215 from f8a1d2df2abde556fe4bb021236dad2c47bcf2e2 to 24Q2-release (cd3e3a96) · Commits · e / os / android_frameworks_opt_telephony

flags/subscription.aconfig

+7 −0

Original line number	Diff line number	Diff line
		@@ -34,3 +34,10 @@ flag {
		description: "Support the psim to esim conversion."
		bug: "315073761"
		}

		flag {
		name: "subscription_user_association_query"
		namespace: "telephony"
		description: "Supports querying if a subscription is associated with the caller"
		bug: "325045841"
		}
		No newline at end of file

src/java/com/android/internal/telephony/subscription/SubscriptionManagerService.java

+26 −1

Original line number	Diff line number	Diff line
		@@ -3943,13 +3943,32 @@ public class SubscriptionManagerService extends ISub.Stub {
		}
		}

		/**
		* Returns whether the given subscription is associated with the calling user.
		*
		* @param subscriptionId the subscription ID of the subscription
		* @return {@code true} if the subscription is associated with the user that the calling process
		* is running in; {@code false} otherwise.
		*
		* @throws IllegalArgumentException if subscription doesn't exist.
		* @throws SecurityException if the caller doesn't have permissions required.
		*/
		@Override
		public boolean isSubscriptionAssociatedWithCallingUser(int subscriptionId) {
		enforcePermissions("isSubscriptionAssociatedWithCallingUser",
		Manifest.permission.READ_PHONE_STATE);

		UserHandle myUserHandle = UserHandle.of(UserHandle.getCallingUserId());
		return mFeatureFlags.subscriptionUserAssociationQuery()
		&& isSubscriptionAssociatedWithUserNoCheck(subscriptionId, myUserHandle);
		}

		/**
		* Check if subscription and user are associated with each other.
		*
		* @param subscriptionId the subId of the subscription
		* @param userHandle user handle of the user
		* @return {@code true} if subscription is associated with user
		* {@code true} if there are no subscriptions on device
		* else {@code false} if subscription is not associated with user.
		*
		* @throws SecurityException if the caller doesn't have permissions required.
		@@ -3960,6 +3979,12 @@ public class SubscriptionManagerService extends ISub.Stub {
		@NonNull UserHandle userHandle) {
		enforcePermissions("isSubscriptionAssociatedWithUser",
		Manifest.permission.MANAGE_SUBSCRIPTION_USER_ASSOCIATION);

		return isSubscriptionAssociatedWithUserNoCheck(subscriptionId, userHandle);
		}

		private boolean isSubscriptionAssociatedWithUserNoCheck(int subscriptionId,
		@NonNull UserHandle userHandle) {
		SubscriptionInfoInternal subInfoInternal = mSubscriptionDatabaseManager
		.getSubscriptionInfoInternal(subscriptionId);
		// Throw IAE if no record of the sub's association state.