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

Commit c4f080de authored by The Android Open Source Project's avatar The Android Open Source Project Committed by Automerger Merge Worker
Browse files

DO NOT MERGE - Merge RP1A.201005.006 am: b5e5b0cc 

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

Change-Id: I6b94470b1a8e0f2d6b744e15269e471fa39282cc
parents b6423d9d b5e5b0cc

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

+7 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ import android.telephony.euicc.EuiccInfo; 
import android.telephony.euicc.EuiccManager;

import android.telephony.euicc.EuiccManager.OtaStatus;

import android.text.TextUtils;

import android.util.EventLog;

import android.util.Log;

import android.util.Pair;
@@ -191,6 +192,12 @@ public class EuiccController extends IEuiccController.Stub { 
    @Override

    public String getEid(int cardId, String callingPackage) {

        boolean callerCanReadPhoneStatePrivileged = callerCanReadPhoneStatePrivileged();

        try {

            mAppOpsManager.checkPackage(Binder.getCallingUid(), callingPackage);

        } catch (SecurityException e) {

            EventLog.writeEvent(0x534e4554, "159062405", -1, "Missing UID checking");

            throw e;

        }

        long token = Binder.clearCallingIdentity();

        try {

            if (!callerCanReadPhoneStatePrivileged