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

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

Merge "Fix Fi activation on Q"

parents 932b96e1 f8c55d81

src/java/com/android/internal/telephony/euicc/EuiccController.java

+9 −6
Original line number Diff line number Diff line
@@ -169,14 +169,17 @@ public class EuiccController extends IEuiccController.Stub { 
     */

    @Override

    public String getEid(int cardId, String callingPackage) {

        if (!callerCanReadPhoneStatePrivileged()

        boolean callerCanReadPhoneStatePrivileged = callerCanReadPhoneStatePrivileged();

        long token = Binder.clearCallingIdentity();

        try {

            if (!callerCanReadPhoneStatePrivileged

                    && !canManageActiveSubscriptionOnTargetSim(cardId, callingPackage)) {

                throw new SecurityException(

                    "Must have carrier privileges on active subscription to read EID for cardId="

                        "Must have carrier privileges on active subscription to read EID for "

                                + "cardId="

                                + cardId);

            }

        long token = Binder.clearCallingIdentity();

        try {



            return blockingGetEidFromEuiccService(cardId);

        } finally {

            Binder.restoreCallingIdentity(token);