commit dbea45a6376e399b276b71f0ee5979c249f98626
author Nathan Harold <nharold@google.com> Thu Aug 30 14:35:07 2018 -0700
committer Nathan Harold <nharold@google.com> Thu Aug 30 21:53:50 2018 +0000
tree 56610eac9e4e32a8664a365128fdbb75e95f854b
parent c64e5c39b57c565cf897f29fa4184825f6eda93b

Throw SecurityException for Q+ getNeighboringCellInfo

If a caller of getNeighboringCellInfo() is targeting a
Q+ SDK level, then the API is unavailable. It will be
@removed (soon), so it should just not be called.

Bug: 112440821
Test: NoLocationPermissionTest#testListenCellLocation2
Change-Id: Ibd4f3e378411a6d4695aefb16dafeeaeea08ca48

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index a97c4b3..145c21f 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -1922,7 +1922,10 @@
     @SuppressWarnings("unchecked")
     public List<NeighboringCellInfo>
             getNeighboringCellInfo(String callingPackage, int targetSdk) {
-        if (targetSdk > android.os.Build.VERSION_CODES.P) return null;
+        if (targetSdk >= android.os.Build.VERSION_CODES.Q) {
+            throw new SecurityException(
+                    "getNeighboringCellInfo() is unavailable to callers targeting Q+ SDK levels.");
+        }
 
         if (mAppOps.noteOp(AppOpsManager.OP_NEIGHBORING_CELLS, Binder.getCallingUid(),
                 callingPackage) != AppOpsManager.MODE_ALLOWED) {