commit 11e82874bdf664494472e2356631527412aeed18
author Aishwarya Mallampati <amallampati@google.com> Mon Mar 13 21:04:00 2023 +0000
committer Aishwarya Mallampati <amallampati@google.com> Fri Mar 17 21:35:11 2023 +0000
tree ce2492ad0b331cf89ddfac2918a61605a0b6d222
parent 833b63b656f535aba153a433e6a54e7abcc9b272

Removed duplicated permission check in getRadioAccessFamily().

Bug: 261887223
Test: atest CtsTelephonyTestCases, atest FrameworkTelephonyTests
Flashed build on raven-userdebug: calls and SMS are working.

Change-Id: I58df297a412ea9872360d4c24fbd2ae8682d0ec7

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index c8efdd0..00da99d 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -7569,7 +7569,12 @@
 
     @Override
     public int getRadioAccessFamily(int phoneId, String callingPackage) {
+        int raf = RadioAccessFamily.RAF_UNKNOWN;
         Phone phone = PhoneFactory.getPhone(phoneId);
+        if (phone == null) {
+            return raf;
+        }
+
         try {
             TelephonyPermissions
                     .enforceCallingOrSelfReadPrivilegedPhoneStatePermissionOrCarrierPrivilege(
@@ -7578,15 +7583,9 @@
             EventLog.writeEvent(0x534e4554, "150857259", -1, "Missing Permission");
             throw e;
         }
-        int raf = RadioAccessFamily.RAF_UNKNOWN;
-        if (phone == null) {
-            return raf;
-        }
+
         final long identity = Binder.clearCallingIdentity();
         try {
-            TelephonyPermissions
-                    .enforceCallingOrSelfReadPrivilegedPhoneStatePermissionOrCarrierPrivilege(
-                            mApp, phone.getSubId(), "getRadioAccessFamily");
             raf = ProxyController.getInstance().getRadioAccessFamily(phoneId);
         } finally {
             Binder.restoreCallingIdentity(identity);