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

Commit 193b5584 authored by Shuo Qian's avatar Shuo Qian Committed by Automerger Merge Worker
Browse files

Add package checking with Uid in EuiccController#getEid am: 1221ede9 

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

Change-Id: Ic1946479377e612c3931c0a5653fbf2caca5100c
parents c9688c8e 1221ede9

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

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

import android.telephony.euicc.EuiccManager;

import android.telephony.euicc.EuiccManager.OtaStatus;

import android.telephony.euicc.EuiccManager.OtaStatus;

import android.text.TextUtils;

import android.text.TextUtils;

import android.util.EventLog;

import android.util.Log;

import android.util.Log;





import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.annotations.VisibleForTesting;
@@ -174,6 +175,12 @@ public class EuiccController extends IEuiccController.Stub { 
    @Override

    @Override

    public String getEid(int cardId, String callingPackage) {

    public String getEid(int cardId, String callingPackage) {

        boolean callerCanReadPhoneStatePrivileged = callerCanReadPhoneStatePrivileged();

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

        long token = Binder.clearCallingIdentity();

        try {

        try {

            if (!callerCanReadPhoneStatePrivileged

            if (!callerCanReadPhoneStatePrivileged