From acd09293116133b6a86d348e011d8347a03266ec Mon Sep 17 00:00:00 2001
From: Svetoslav <svetoslavganov@google.com>
Date: Fri, 28 Aug 2015 18:39:21 -0700
Subject: Show location permission toggle for location provider

bug:23528665

Change-Id: Id3a0838c3421b56dcf47c86043bb51c670268d03
---
 .../android/packageinstaller/permission/model/AppPermissionGroup.java   | 2 +-
 .../packageinstaller/permission/model/PermissionStatusReceiver.java     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/com/android/packageinstaller/permission/model')

diff --git a/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java b/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java
index 633336c3..9d65bcc0 100644
--- a/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java
+++ b/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java
@@ -265,7 +265,7 @@ public final class AppPermissionGroup implements Comparable<AppPermissionGroup>
     }
 
     public boolean areRuntimePermissionsGranted() {
-        if (LocationUtils.isLocked(mName, mPackageInfo.packageName)) {
+        if (LocationUtils.isLocationGroupAndProvider(mName, mPackageInfo.packageName)) {
             return LocationUtils.isLocationEnabled(mContext);
         }
         final int permissionCount = mPermissions.size();
diff --git a/src/com/android/packageinstaller/permission/model/PermissionStatusReceiver.java b/src/com/android/packageinstaller/permission/model/PermissionStatusReceiver.java
index 52fb874e..7bae18f3 100644
--- a/src/com/android/packageinstaller/permission/model/PermissionStatusReceiver.java
+++ b/src/com/android/packageinstaller/permission/model/PermissionStatusReceiver.java
@@ -75,7 +75,7 @@ public class PermissionStatusReceiver extends BroadcastReceiver {
             int additionalCount = 0;
 
             for (AppPermissionGroup group : appPermissions.getPermissionGroups()) {
-                if (Utils.shouldShowPermission(group)) {
+                if (Utils.shouldShowPermission(group, pkg)) {
                     totalCount++;
                     if (group.areRuntimePermissionsGranted()) {
                         grantedCount++;
-- 
cgit v1.2.3