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

Commit 7be21989 authored by Patrick Huang's avatar Patrick Huang Committed by android-build-merger
Browse files

Merge "Fix Fi activation on Q" am: de2e9e39 

am: dd032d16

Change-Id: I9025b9fd9515721b4756047b15783f9e25b88983
parents d7998734 dd032d16

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);