aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2020-08-05 01:10:37 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2020-08-05 01:10:37 +0000
commit49f47598c4a05b2ae5661e75519122bbd67cee3d (patch)
tree1575cabe92dbc01b42d78aee892ce19988e20eec
parentdd6f416c83e72f780a3ab2d7c7cc6e051c1a4397 (diff)
parentb26db37949f7e75a5862160762294a4170060b2c (diff)
downloadtelephony-49f47598c4a05b2ae5661e75519122bbd67cee3d.tar.gz
Snap for 6736502 from b26db37949f7e75a5862160762294a4170060b2c to rvc-d1-release
Change-Id: I19e78946781cc72507dd7b9476d863234eb775fb
-rw-r--r--src/java/com/android/internal/telephony/euicc/EuiccController.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/java/com/android/internal/telephony/euicc/EuiccController.java b/src/java/com/android/internal/telephony/euicc/EuiccController.java
index 09e17c3dea..400c326713 100644
--- a/src/java/com/android/internal/telephony/euicc/EuiccController.java
+++ b/src/java/com/android/internal/telephony/euicc/EuiccController.java
@@ -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