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

1 files changed, 2 insertions, 2 deletions

diff --git a/src/com/android/packageinstaller/permission/ui/AppPermissionsFragment.java b/src/com/android/packageinstaller/permission/ui/AppPermissionsFragment.java
index afa32341..6396c61e 100644
--- a/src/com/android/packageinstaller/permission/ui/AppPermissionsFragment.java
+++ b/src/com/android/packageinstaller/permission/ui/AppPermissionsFragment.java
@@ -205,7 +205,7 @@ public final class AppPermissionsFragment extends SettingsWithHeader
         extraPerms.setTitle(R.string.additional_permissions);
 
         for (AppPermissionGroup group : mAppPermissions.getPermissionGroups()) {
-            if (!Utils.shouldShowPermission(group)) {
+            if (!Utils.shouldShowPermission(group, mAppPermissions.getPackageInfo().packageName)) {
                 continue;
             }
 
@@ -276,7 +276,7 @@ public final class AppPermissionsFragment extends SettingsWithHeader
 
         addToggledGroup(group);
 
-        if (LocationUtils.isLocked(group.getName(), group.getApp().packageName)) {
+        if (LocationUtils.isLocationGroupAndProvider(group.getName(), group.getApp().packageName)) {
             LocationUtils.showLocationDialog(getContext(), mAppPermissions.getAppLabel());
             return false;
         }