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

Commit d2d5a507 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fix CarrierApiTest#testOpportunistic CTS case failure" into main

parents ce820631 248dc9ea

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

+1 −1
Original line number Original line 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) {

    public int setOpportunistic(boolean opportunistic, int subId, @NonNull String callingPackage) {

        TelephonyPermissions.enforceAnyPermissionGrantedOrCarrierPrivileges(

        TelephonyPermissions.enforceAnyPermissionGrantedOrCarrierPrivileges(

                mContext, Binder.getCallingUid(), subId, true, "setOpportunistic",

                mContext, subId, Binder.getCallingUid(), true, "setOpportunistic",

                Manifest.permission.MODIFY_PHONE_STATE);

                Manifest.permission.MODIFY_PHONE_STATE);





        long token = Binder.clearCallingIdentity();

        long token = Binder.clearCallingIdentity();