commit e38b1dbf91139d19fd14be5b7c7ab33d287de1aa
author android-build-team Robot <android-build-team-robot@google.com> Tue Sep 15 23:56:25 2020 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Tue Sep 15 23:56:25 2020 +0000
tree 6b6854ced637bffd6bb93658a98de78d6d3724d6
parent 7e07c05d7446690161240701d3e0d184dc88e5a7
parent 8fa245834c5148c0b178214888115ebe73e58120

Snap for 6838321 from 8fa245834c5148c0b178214888115ebe73e58120 to mainline-release

Change-Id: I467d1452d61cfd98abda9935a34135e3da8e0f92

src/java/com/android/internal/telephony/dataconnection/DcNetworkAgent.java

diff --git a/src/java/com/android/internal/telephony/dataconnection/DcNetworkAgent.java b/src/java/com/android/internal/telephony/dataconnection/DcNetworkAgent.java
index 3be5b28..7fa1f97 100644
--- a/src/java/com/android/internal/telephony/dataconnection/DcNetworkAgent.java
+++ b/src/java/com/android/internal/telephony/dataconnection/DcNetworkAgent.java
@@ -92,6 +92,7 @@
         mTransportType = transportType;
         mDataConnection = dc;
         mNetworkInfo = new NetworkInfo(ni);
+        setLegacySubtype(ni.getSubtype(), ni.getSubtypeName());
         setLegacyExtraInfo(ni.getExtraInfo());
         // TODO: Remove before R is released.
         if (dc.getLinkProperties() != null

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

diff --git a/src/java/com/android/internal/telephony/euicc/EuiccController.java b/src/java/com/android/internal/telephony/euicc/EuiccController.java
index 09e17c3..400c326 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.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 @@
     @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