commit e05b92432011190b88316a48c7a9a1f18342ad94
author Nathan Harold <nharold@google.com> Wed Aug 01 16:36:22 2018 -0700
committer android-build-merger <android-build-merger@google.com> Wed Aug 01 16:36:22 2018 -0700
tree 36c2914c20d7c4fe9205fa61675bbc2046a6b3c9
parent 815aee54a5335308693a961806ea07805c15ef1a
parent c9a36de8ea2c6e198fee961237d0308f2f0e15f3

Merge "Check SDK Version For NeighborCellInfo" am: 954a5e399a am: 4d3f457d1f
am: c9a36de8ea

Change-Id: I8c65c2a23cf5067125019aa1affc730eb3eaf234

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index b7d062f..79fd5ab 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -1944,9 +1944,11 @@
 
     @Override
     @SuppressWarnings("unchecked")
-    public List<NeighboringCellInfo> getNeighboringCellInfo(String callingPackage) {
-        mPhone.getContext().getSystemService(AppOpsManager.class)
-                .checkPackage(Binder.getCallingUid(), callingPackage);
+    public List<NeighboringCellInfo>
+            getNeighboringCellInfo(String callingPackage, int targetSdk) {
+        // FIXME: use the P constant when available
+        if (targetSdk > android.os.Build.VERSION_CODES.O_MR1 + 1) return null;
+
         if (!LocationAccessPolicy.canAccessCellLocation(mPhone.getContext(),
                 callingPackage, Binder.getCallingUid(), Binder.getCallingPid(), true)) {
             return null;