Merge "Show location permission group, even when fixed." into mnc-dev

9b724fd6 · Jeff Sharkey · Android (Google) Code Review · ab1e5900 · 3c093f94 · 9b724fd6
Commit 9b724fd6 authored 9 years ago by Jeff Sharkey Committed by Android (Google) Code Review 9 years ago
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

src/com/android/packageinstaller/permission/utils/Utils.java src/com/android/packageinstaller/permission/utils/Utils.java +4 -2

No files found.
--- a/src/com/android/packageinstaller/permission/utils/Utils.java
+++ b/src/com/android/packageinstaller/permission/utils/Utils.java
@@ -79,7 +79,8 @@ 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()) {
+        if (group.isSystemFixed()
+                && !Manifest.permission_group.LOCATION.equals(group.getName())) {
            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()
+                && !Manifest.permission_group.LOCATION.equals(app.getPermissionGroup().getName())) {
            return false;
        }