Merge "Show location permission toggle for location provider" into mnc-dev

2 files changed, 6 insertions, 4 deletions

diff --git a/src/com/android/packageinstaller/permission/utils/LocationUtils.java b/src/com/android/packageinstaller/permission/utils/LocationUtils.java
index 4c4ea6e3..512fcf44 100644
--- a/src/com/android/packageinstaller/permission/utils/LocationUtils.java
+++ b/src/com/android/packageinstaller/permission/utils/LocationUtils.java
@@ -70,7 +70,7 @@ public class LocationUtils {
                 Settings.Secure.LOCATION_MODE_OFF) != Settings.Secure.LOCATION_MODE_OFF;
     }
 
-    public static boolean isLocked(String groupName, String packageName) {
+    public static boolean isLocationGroupAndProvider(String groupName, String packageName) {
         return LOCATION_PERMISSION.equals(groupName) && isNetworkLocationProvider(packageName);
     }
 
diff --git a/src/com/android/packageinstaller/permission/utils/Utils.java b/src/com/android/packageinstaller/permission/utils/Utils.java
index 552d4ad4..7b9a2b65 100644
--- a/src/com/android/packageinstaller/permission/utils/Utils.java
+++ b/src/com/android/packageinstaller/permission/utils/Utils.java
@@ -76,10 +76,11 @@ public class Utils {
         return false;
     }
 
-    public static boolean shouldShowPermission(AppPermissionGroup group) {
+    public static boolean shouldShowPermission(AppPermissionGroup group, String packageName) {
         // 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() && !LocationUtils.isLocationGroupAndProvider(
+                group.getName(), packageName)) {
             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() && !LocationUtils.isLocationGroupAndProvider(
+                app.getPermissionGroup().getName(), app.getPackageName())) {
             return false;
         }