summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSvetoslav Ganov <svetoslavganov@google.com>2015-08-31 20:10:49 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-08-31 20:10:49 +0000
commit711f8a176cf8cd067deaa5b16cb38f66b20376b4 (patch)
tree21540faa832bbebb3fd91b54529012adbafb4c8a /src
parent79fe6c1c4e10a1d9808ea2c7c81a16f0c180a917 (diff)
parent2d03ddd5d73a16a63a3a3e6a412967183163ecee (diff)
downloadandroid_packages_apps_PackageInstaller-711f8a176cf8cd067deaa5b16cb38f66b20376b4.tar.gz
android_packages_apps_PackageInstaller-711f8a176cf8cd067deaa5b16cb38f66b20376b4.tar.bz2
android_packages_apps_PackageInstaller-711f8a176cf8cd067deaa5b16cb38f66b20376b4.zip
Merge "Revert "Show location permission group, even when fixed."" into mnc-dev
Diffstat (limited to 'src')
-rw-r--r--src/com/android/packageinstaller/permission/utils/Utils.java6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/com/android/packageinstaller/permission/utils/Utils.java b/src/com/android/packageinstaller/permission/utils/Utils.java
index ac47025f..552d4ad4 100644
--- a/src/com/android/packageinstaller/permission/utils/Utils.java
+++ b/src/com/android/packageinstaller/permission/utils/Utils.java
@@ -79,8 +79,7 @@ public class Utils {
public static boolean shouldShowPermission(AppPermissionGroup group) {
// We currently will not show permissions fixed by the system.
// which is what the system does for system components.
- if (group.isSystemFixed()
- && !Manifest.permission_group.LOCATION.equals(group.getName())) {
+ if (group.isSystemFixed()) {
return false;
}
@@ -103,8 +102,7 @@ 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()
- && !Manifest.permission_group.LOCATION.equals(app.getPermissionGroup().getName())) {
+ if (app.isSystemFixed()) {
return false;
}