commit dee5340222a2c67c5af29da78f235f5bbf54436b
author Shuo Qian <shuoq@google.com> Fri May 29 14:08:15 2020 -0700
committer Shuo Qian <shuoq@google.com> Tue Jun 02 23:09:54 2020 +0000
tree c957f746cb4ddbbde8b8218121da77c8fe5a905b
parent ba2c6c3834c7c3b2ccd677df741b71bd57ea76ad

Check System permission for getRadioAccessFamily API

Test: CTS later; Safe net log
Bug: 150857259
Change-Id: I59674498c46c9a94b7bf82300316993d41f6a542

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index b045c0f..eec50ef 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -115,6 +115,7 @@
 import android.telephony.ims.stub.ImsRegistrationImplBase;
 import android.text.TextUtils;
 import android.util.ArraySet;
+import android.util.EventLog;
 import android.util.Log;
 import android.util.Pair;
 
@@ -6243,6 +6244,14 @@
     @Override
     public int getRadioAccessFamily(int phoneId, String callingPackage) {
         Phone phone = PhoneFactory.getPhone(phoneId);
+        try {
+            TelephonyPermissions
+                    .enforeceCallingOrSelfReadPrivilegedPhoneStatePermissionOrCarrierPrivilege(
+                            mApp, phone.getSubId(), "getRadioAccessFamily");
+        } catch (SecurityException e) {
+            EventLog.writeEvent(0x534e4554, "150857259", -1, "Missing Permission");
+            throw e;
+        }
         int raf = RadioAccessFamily.RAF_UNKNOWN;
         if (phone == null) {
             return raf;