commit c5f8b0eebd020ac024080df8002ffc44059ccb82
author Nathan Harold <nharold@google.com> Fri Aug 10 17:23:49 2018 -0700
committer android-build-merger <android-build-merger@google.com> Fri Aug 10 17:23:49 2018 -0700
tree e93c659a2bc666860228f5527b9fe40813f80d67
parent b58a2e1dca147f53daaabf9a1ab269157dc1626c
parent 378d5e61841518ab249eed644450b9a93842a39c

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

Change-Id: I6d3f944b578c2de63f80632f8f1ead38a7fadd4c

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) {