Merge "Removed the flag enable_modem_cipher_transparency_unsol_events" into main
diff --git a/src/java/com/android/internal/telephony/subscription/SubscriptionManagerService.java b/src/java/com/android/internal/telephony/subscription/SubscriptionManagerService.java
index f58c723..0039558 100644
--- a/src/java/com/android/internal/telephony/subscription/SubscriptionManagerService.java
+++ b/src/java/com/android/internal/telephony/subscription/SubscriptionManagerService.java
@@ -4129,6 +4129,9 @@
* Returns whether the given subscription is associated with the calling user.
*
* @param subscriptionId the subscription ID of the subscription
+ * @param callingPackage The package making the call
+ * @param callingFeatureId The feature in the package
+ *
* @return {@code true} if the subscription is associated with the user that the calling process
* is running in; {@code false} otherwise.
*
@@ -4136,9 +4139,13 @@
* @throws SecurityException if the caller doesn't have permissions required.
*/
@Override
- public boolean isSubscriptionAssociatedWithCallingUser(int subscriptionId) {
- enforcePermissions("isSubscriptionAssociatedWithCallingUser",
- Manifest.permission.READ_PHONE_STATE);
+ public boolean isSubscriptionAssociatedWithCallingUser(int subscriptionId,
+ @NonNull String callingPackage, @Nullable String callingFeatureId) {
+ if (!TelephonyPermissions.checkCallingOrSelfReadPhoneState(mContext, subscriptionId,
+ callingPackage, callingFeatureId, "isSubscriptionAssociatedWithCallingUser")) {
+ throw new SecurityException("Need READ_PHONE_STATE, READ_PRIVILEGED_PHONE_STATE, or "
+ + "carrier privilege");
+ }
UserHandle myUserHandle = UserHandle.of(UserHandle.getCallingUserId());
return mFeatureFlags.subscriptionUserAssociationQuery()