Show location permission group, even when fixed.

System fixed permissions are typically hidden in the UI, but we need
to special-case the Location group to help guide the user to another
part of Settings where they can manage location access.

Bug: 21805447
Change-Id: Ia6b30b4651c9ed42e0279e729e544b654940dde6

1 files changed, 4 insertions, 2 deletions

diff --git a/src/com/android/packageinstaller/permission/utils/Utils.java b/src/com/android/packageinstaller/permission/utils/Utils.java
index 552d4ad4..ac47025f 100644
--- a/src/com/android/packageinstaller/permission/utils/Utils.java
+++ b/src/com/android/packageinstaller/permission/utils/Utils.java
@@ -79,7 +79,8 @@ public class Utils {
     public static boolean shouldShowPermission(AppPermissionGroup group) {
         // We currently will not show permissions fixed by the system.
         // which is what the system does for system components.
-        if (group.isSystemFixed()) {
+        if (group.isSystemFixed()
+                && !Manifest.permission_group.LOCATION.equals(group.getName())) {
             return false;
         }
 
@@ -102,7 +103,8 @@ public class Utils {
     public static boolean shouldShowPermission(PermissionApp app) {
         // We currently will not show permissions fixed by the system
         // which is what the system does for system components.
-        if (app.isSystemFixed()) {
+        if (app.isSystemFixed()
+                && !Manifest.permission_group.LOCATION.equals(app.getPermissionGroup().getName())) {
             return false;
         }