diff options
| author | Jeff Sharkey <jsharkey@google.com> | 2015-08-21 18:21:26 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-21 18:21:26 +0000 |
| commit | 1b066ca094bf6c3ab0157a97ec4a20f988e0ed0a (patch) | |
| tree | 2901bca91e6c47b07bd72fc52d33fcae64f66292 | |
| parent | af8c918e6a54c95d35f1e92cb16a4251e1ee7fb8 (diff) | |
| parent | 9b724fd6ddd5be3b21f9fea7977bd573659e7ecc (diff) | |
| download | android_packages_apps_PackageInstaller-1b066ca094bf6c3ab0157a97ec4a20f988e0ed0a.tar.gz android_packages_apps_PackageInstaller-1b066ca094bf6c3ab0157a97ec4a20f988e0ed0a.tar.bz2 android_packages_apps_PackageInstaller-1b066ca094bf6c3ab0157a97ec4a20f988e0ed0a.zip | |
am 9b724fd6: Merge "Show location permission group, even when fixed." into mnc-dev
* commit '9b724fd6ddd5be3b21f9fea7977bd573659e7ecc':
Show location permission group, even when fixed.
| -rw-r--r-- | src/com/android/packageinstaller/permission/utils/Utils.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/packageinstaller/permission/utils/Utils.java b/src/com/android/packageinstaller/permission/utils/Utils.java index 552d4ad4..ac47025f 100644 --- 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; } |