From 248dc9ea5defc8dca334ad05e93b5ec44f54cac5 Mon Sep 17 00:00:00 2001 From: rambowang Date: Thu, 25 Apr 2024 16:10:59 +0000 Subject: Fix CarrierApiTest#testOpportunistic CTS case failure setOpportunistic in SubscriptionManagerService tris to call method TelephonyPermissions.enforceAnyPermissionGrantedOrCarrierPrivileges with the second and third parameter (subscription id v.s. calling uid) reversed. This CL fixes the issue by calling the same method with righ parameters. Bug: 335101735 Test: atest CarrierApiTest (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:15f3b32643f11b8837c6909b5137d4ebfa861b97) Merged-In: Iba4b001da7f13f5adef27a6c24ab48981c959c3f Change-Id: Iba4b001da7f13f5adef27a6c24ab48981c959c3f --- .../internal/telephony/subscription/SubscriptionManagerService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/java/com/android/internal/telephony/subscription/SubscriptionManagerService.java b/src/java/com/android/internal/telephony/subscription/SubscriptionManagerService.java index a8d05a334b..93eeb3f53e 100644 --- a/src/java/com/android/internal/telephony/subscription/SubscriptionManagerService.java +++ b/src/java/com/android/internal/telephony/subscription/SubscriptionManagerService.java @@ -2379,7 +2379,7 @@ public class SubscriptionManagerService extends ISub.Stub { }) public int setOpportunistic(boolean opportunistic, int subId, @NonNull String callingPackage) { TelephonyPermissions.enforceAnyPermissionGrantedOrCarrierPrivileges( - mContext, Binder.getCallingUid(), subId, true, "setOpportunistic", + mContext, subId, Binder.getCallingUid(), true, "setOpportunistic", Manifest.permission.MODIFY_PHONE_STATE); long token = Binder.clearCallingIdentity(); -- cgit v1.2.3