commit 008b1691af97f9d0f8d4b32fa1956f151916f5b0
author Hall Liu <hallliu@google.com> Tue May 26 17:18:03 2020 -0700
committer Rambo Wang <rambowang@google.com> Wed May 05 19:34:04 2021 +0000
tree dae0bcddefd794fe6685c61d2647a4bed4fc3b8d
parent 0d1ef468f91f7473f228616dc509d93c81ee8438

LocationAccessQuery builder changes and tests

Add tests for the new requirements on LocationAccessQuery.Builder

Modify permission checks in PhoneInterfaceManager to adapt to the new
requirements.

Bug: 157170257
Test: atest LocationAccessPolicyTest

Merged-In: If6791955d360d019e175cc9255126fd956faae87
Change-Id: If6791955d360d019e175cc9255126fd956faae87
(cherry picked from commit c4a3e42c749b0d03a3928dc09cb9c36a03a87916)

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 68bc19c..a53fe55 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -5770,6 +5770,8 @@
                                 .setCallingUid(Binder.getCallingUid())
                                 .setMethod("getCellNetworkScanResults")
                                 .setMinSdkVersionForFine(Build.VERSION_CODES.Q)
+                                .setMinSdkVersionForCoarse(Build.VERSION_CODES.Q)
+                                .setMinSdkVersionForEnforcement(Build.VERSION_CODES.Q)
                                 .build());
         switch (locationResult) {
             case DENIED_HARD:
@@ -7449,6 +7451,8 @@
                                 .setMethod("getServiceStateForSubscriber")
                                 .setLogAsInfo(true)
                                 .setMinSdkVersionForFine(Build.VERSION_CODES.Q)
+                                .setMinSdkVersionForCoarse(Build.VERSION_CODES.Q)
+                                .setMinSdkVersionForEnforcement(Build.VERSION_CODES.Q)
                                 .build());
 
         LocationAccessPolicy.LocationPermissionResult coarseLocationResult =
@@ -7461,6 +7465,8 @@
                                 .setMethod("getServiceStateForSubscriber")
                                 .setLogAsInfo(true)
                                 .setMinSdkVersionForCoarse(Build.VERSION_CODES.Q)
+                                .setMinSdkVersionForFine(Integer.MAX_VALUE)
+                                .setMinSdkVersionForEnforcement(Build.VERSION_CODES.Q)
                                 .build());
         // We don't care about hard or soft here -- all we need to know is how much info to scrub.
         boolean hasFinePermission =