commit 90d517b07b5407971936087c2d7efda5793b6746
author Treehugger Robot <treehugger-gerrit@google.com> Tue Sep 04 17:40:54 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Sep 04 17:40:54 2018 +0000
tree f387d5b3116157bf84d48cfe89224f92e3f871bb
parent 0aa764b5512b053a1d6e39a635f743468b292f65
parent dbea45a6376e399b276b71f0ee5979c249f98626

Merge "Throw SecurityException for Q+ getNeighboringCellInfo"

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 02492d1..51ffbd8 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) {