commit c3f8eb66822b3f32d3af7b78d2220d9a53d8091d
author Hall Liu <hallliu@google.com> Fri Jan 24 18:07:12 2020 -0800
committer Hall Liu <hallliu@google.com> Wed Mar 04 21:52:41 2020 +0000
tree b7ded773d13e77ea1bef7fc7913918bd9249d210
parent 8b04a9a40d10164b9e5f3ea42660f21932ecb8ff

Enforce ACCESS_COARSE_LOCATION on getCellLocation

A implementation bug in Q meant that we weren't checking
ACCESS_COARSE_LOCATION on apps targeting API 28 or earlier on
getCellLocation. This change patches this issue.

Bug: 147402629
Bug: 148414207
Test: atest TelephonyManagerTest:#testSdk28CellLocation
Change-Id: Ie1f622307dec66500b83e960a44f49c37068007e
(cherry picked from commit 773ba0257913f3fa3fc1e28d33826ea6cbdf86cd)

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index d0ed9bd..8b5eac2 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -1913,6 +1913,7 @@
                                 .setCallingPid(Binder.getCallingPid())
                                 .setCallingUid(Binder.getCallingUid())
                                 .setMethod("getCellLocation")
+                                .setMinSdkVersionForCoarse(Build.VERSION_CODES.BASE)
                                 .setMinSdkVersionForFine(Build.VERSION_CODES.Q)
                                 .build());
         switch (locationResult) {