commit 68f322ab62e1b6c66941f5b09a93dbe452c58ae5
author Nathan Harold <nharold@google.com> Fri Aug 10 22:13:40 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Aug 10 22:13:40 2018 +0000
tree 222863699da4720192d2f7bd8c62ce147950355e
parent 63d3dfc2c702c0f8195d001ecf74603d8ab8632e
parent 54a07f9d19d4e89d7e19fa941a9da236bd2eabf4

Merge "Use P SDK Constant To Check NeighboringCell"

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 90d7924..2df3bbe 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -1919,8 +1919,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) {