commit c4a3e42c749b0d03a3928dc09cb9c36a03a87916
author Hall Liu <hallliu@google.com> Tue May 26 17:18:03 2020 -0700
committer Hall Liu <hallliu@google.com> Thu Jun 04 17:21:46 2020 -0700
tree 010965dcfc89074173fed01087ddcad8f4810d48
parent 5ba3e4aa1c6a8fd02e36465069b444097949f7ec

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

Change-Id: If6791955d360d019e175cc9255126fd956faae87

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 3016fca..6d0c4d2 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -5302,6 +5302,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:
@@ -6759,6 +6761,8 @@
                                 .setMethod("getServiceStateForSubscriber")
                                 .setLogAsInfo(true)
                                 .setMinSdkVersionForFine(Build.VERSION_CODES.Q)
+                                .setMinSdkVersionForCoarse(Build.VERSION_CODES.Q)
+                                .setMinSdkVersionForEnforcement(Build.VERSION_CODES.Q)
                                 .build());
 
         LocationAccessPolicy.LocationPermissionResult coarseLocationResult =
@@ -6771,6 +6775,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 =