diff options
| author | Svetoslav Ganov <svetoslavganov@google.com> | 2015-08-31 20:11:00 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-08-31 20:11:00 +0000 |
| commit | f7fc063145df915b76c93945b2dd5e792d4cdd80 (patch) | |
| tree | 7424e165bdc8a44fa0245610d244a83f493d35ca /src/com/android/packageinstaller/permission/model | |
| parent | 711f8a176cf8cd067deaa5b16cb38f66b20376b4 (diff) | |
| parent | acd09293116133b6a86d348e011d8347a03266ec (diff) | |
| download | android_packages_apps_PackageInstaller-f7fc063145df915b76c93945b2dd5e792d4cdd80.tar.gz android_packages_apps_PackageInstaller-f7fc063145df915b76c93945b2dd5e792d4cdd80.tar.bz2 android_packages_apps_PackageInstaller-f7fc063145df915b76c93945b2dd5e792d4cdd80.zip | |
Merge "Show location permission toggle for location provider" into mnc-dev
Diffstat (limited to 'src/com/android/packageinstaller/permission/model')
| -rw-r--r-- | src/com/android/packageinstaller/permission/model/AppPermissionGroup.java | 2 | ||||
| -rw-r--r-- | src/com/android/packageinstaller/permission/model/PermissionStatusReceiver.java | 2 |
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++; |