diff options
| author | Svetoslav Ganov <svetoslavganov@google.com> | 2015-08-31 20:31:36 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-31 20:31:36 +0000 |
| commit | 18e796f5e4d62361ed95ba3325d8b934090cac60 (patch) | |
| tree | 977d89421e29a6044507b8892f9265602e7be770 /src | |
| parent | 95a6fb8ae34efb424017253c718d595aa6f1b7fd (diff) | |
| parent | 954f5f2ed1c7ff288ba9f4686bdee93860d02720 (diff) | |
| download | android_packages_apps_PackageInstaller-18e796f5e4d62361ed95ba3325d8b934090cac60.tar.gz android_packages_apps_PackageInstaller-18e796f5e4d62361ed95ba3325d8b934090cac60.tar.bz2 android_packages_apps_PackageInstaller-18e796f5e4d62361ed95ba3325d8b934090cac60.zip | |
am 954f5f2e: am 711f8a17: Merge "Revert "Show location permission group, even when fixed."" into mnc-dev
* commit '954f5f2ed1c7ff288ba9f4686bdee93860d02720':
Revert "Show location permission group, even when fixed."
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/packageinstaller/permission/utils/Utils.java | 6 |
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; } |