commit 1121edc4bfaebbd10827e01f4d7d45051879e512
author Nathan Harold <nharold@google.com> Fri Aug 10 18:14:54 2018 -0700
committer android-build-merger <android-build-merger@google.com> Fri Aug 10 18:14:54 2018 -0700
tree bbe0ea165944aeca2ba4216cda66e24b7173049d
parent c2c01650c822e53e8b5dcafc2fc27dd735c400ce
parent c5f8b0eebd020ac024080df8002ffc44059ccb82

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

Change-Id: Id812ccd05fd4efd0fdc9e07d083a29f6f0756d7e

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index d0cb36e..495b084 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) {