aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com>2024-04-25 17:17:23 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2024-04-25 17:17:23 +0000
commitd2d5a507e3f860787b8aa465913b957845c20004 (patch)
tree638aaf3c0622c9090d185beeb5270c7c9c8bb8c2
parentce820631d58f50b169448a940f98f926fa180f44 (diff)
parent248dc9ea5defc8dca334ad05e93b5ec44f54cac5 (diff)
downloadtelephony-master.tar.gz
Merge "Fix CarrierApiTest#testOpportunistic CTS case failure" into mainHEADmastermain
-rw-r--r--src/java/com/android/internal/telephony/subscription/SubscriptionManagerService.java2
1 files changed, 1 insertions, 1 deletions
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();