diff options
author | Svetoslav <svetoslavganov@google.com> | 2015-08-28 18:39:21 -0700 |
---|---|---|
committer | Svetoslav <svetoslavganov@google.com> | 2015-08-28 18:58:34 -0700 |
commit | acd09293116133b6a86d348e011d8347a03266ec (patch) | |
tree | 41f3bd77399588fe06b77eae5a37a46e5a59fd01 /src/com/android/packageinstaller/permission/utils | |
parent | 2d03ddd5d73a16a63a3a3e6a412967183163ecee (diff) | |
download | android_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/utils')
-rw-r--r-- | src/com/android/packageinstaller/permission/utils/LocationUtils.java | 2 | ||||
-rw-r--r-- | src/com/android/packageinstaller/permission/utils/Utils.java | 8 |
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; } |