summaryrefslogtreecommitdiffstats
path: root/src/com/android/packageinstaller/permission/model
diff options
context:
space:
mode:
authorSvetoslav <svetoslavganov@google.com>2015-08-28 18:39:21 -0700
committerSvetoslav <svetoslavganov@google.com>2015-08-28 18:58:34 -0700
commitacd09293116133b6a86d348e011d8347a03266ec (patch)
tree41f3bd77399588fe06b77eae5a37a46e5a59fd01 /src/com/android/packageinstaller/permission/model
parent2d03ddd5d73a16a63a3a3e6a412967183163ecee (diff)
downloadandroid_packages_apps_PackageInstaller-acd09293116133b6a86d348e011d8347a03266ec.tar.gz
android_packages_apps_PackageInstaller-acd09293116133b6a86d348e011d8347a03266ec.tar.bz2
android_packages_apps_PackageInstaller-acd09293116133b6a86d348e011d8347a03266ec.zip
Show location permission toggle for location provider
bug:23528665 Change-Id: Id3a0838c3421b56dcf47c86043bb51c670268d03
Diffstat (limited to 'src/com/android/packageinstaller/permission/model')
-rw-r--r--src/com/android/packageinstaller/permission/model/AppPermissionGroup.java2
-rw-r--r--src/com/android/packageinstaller/permission/model/PermissionStatusReceiver.java2
2 files changed, 2 insertions, 2 deletions
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++;