commit b55f63bb621582c00ff5378d06823357140fd9de
author Nathan Harold <nharold@google.com> Tue Jul 27 11:27:38 2021 -0700
committer Nathan Harold <nharold@google.com> Fri Aug 20 13:38:20 2021 -0700
tree f2bea27ac54718135bb098061fa1d4a33203c665
parent d7f7bdf6206fa9cf2bd503835155a3b68ed3cab2

Check PkgName in getNeighboringCellInfo

Bug: 190619791
Test: atest TelephonyManagerTest#testNeighborCellChecksPackage
Change-Id: I30faf01d808e6e91e91de294740ca0d295fc04a7

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 64b2e4d..4254a35 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -2947,6 +2947,14 @@
     @SuppressWarnings("unchecked")
     public List<NeighboringCellInfo> getNeighboringCellInfo(String callingPackage,
             String callingFeatureId) {
+        try {
+            mApp.getSystemService(AppOpsManager.class)
+                    .checkPackage(Binder.getCallingUid(), callingPackage);
+        } catch (SecurityException e) {
+            EventLog.writeEvent(0x534e4554, "190619791", Binder.getCallingUid());
+            throw e;
+        }
+
         final int targetSdk = TelephonyPermissions.getTargetSdk(mApp, callingPackage);
         if (targetSdk >= android.os.Build.VERSION_CODES.Q) {
             throw new SecurityException(