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

Commit eb6a98ad authored by Nathan Harold's avatar Nathan Harold Committed by Android (Google) Code Review
Browse files

Merge "Use provided UID for checking Carrier Privileges" into main

parents f6801442 e1feb6b0

telephony/common/com/android/internal/telephony/TelephonyPermissions.java

+1 −1
Original line number Diff line number Diff line
@@ -793,7 +793,7 @@ public final class TelephonyPermissions { 
        if (isGranted) return;



        if (allowCarrierPrivilegeOnAnySub) {

            if (checkCarrierPrivilegeForAnySubId(context, Binder.getCallingUid())) return;

            if (checkCarrierPrivilegeForAnySubId(context, uid)) return;

        } else {

            if (checkCarrierPrivilegeForSubId(context, subId)) return;

        }