Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cc318984 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix CarrierApiTest#testOpportunistic CTS case failure" into main am: d2d5a507 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/3062202



Change-Id: I076f9d63e4f47ca019953c9075fc689462255202
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 47962ded d2d5a507

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

+1 −1
Original line number Diff line number Diff line
@@ -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();