commit 378d5e61841518ab249eed644450b9a93842a39c
author Nathan Harold <nharold@google.com> Fri Aug 10 16:02:10 2018 -0700
committer android-build-merger <android-build-merger@google.com> Fri Aug 10 16:02:10 2018 -0700
tree 124548a9c8fbef30c98b570769470d825cf9ad3a
parent 3d5dbb9d4c17d63b8764501a4f4e7e6ff9b41314
parent f6bb9e4baf4af46891eb622135c22f11899f414c

Merge "Use P SDK Constant To Check NeighboringCell" am: 68f322ab62
am: f6bb9e4baf

Change-Id: Iff7aab5447b3321b0868ab8bd1c1c8d4e34abb18

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index a99d01e..ed77c0c 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -1924,8 +1924,7 @@
     @SuppressWarnings("unchecked")
     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 (targetSdk > android.os.Build.VERSION_CODES.P) return null;
 
         if (mAppOps.noteOp(AppOpsManager.OP_NEIGHBORING_CELLS, Binder.getCallingUid(),
                 callingPackage) != AppOpsManager.MODE_ALLOWED) {