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

Commit ef289bf2 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [12364563, 12364330, 12364331, 12364332, 12363743,... 

Merge cherrypicks of [12364563, 12364330, 12364331, 12364332, 12363743, 12364605, 12363956, 12363957, 12363958, 12364309, 12364483, 12364484, 12364564, 12364333, 12364334, 12364335, 12364336, 12364337, 12364607] into rvc-release

Change-Id: I5f47af1eb6bf5aecd0dbdac28062e7beef1aafd9
parents 1e1f3eb2 cfaf9f98

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