diff options
| author | Ian Pedowitz <ijpedowitz@google.com> | 2015-08-27 01:13:58 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-08-27 01:13:58 +0000 |
| commit | 919d56f9a21aa388c08dd32c99e7b47b4637e96a (patch) | |
| tree | 3d17d457a8d965d9da7b54145c35fffe5f10d18c /src | |
| parent | 0d93cfb9aff10029057acecf094c0572fa6cce9f (diff) | |
| parent | e8bec6ae5a025db8b6bab618bf12b74bff48aa04 (diff) | |
| download | android_packages_apps_PackageInstaller-919d56f9a21aa388c08dd32c99e7b47b4637e96a.tar.gz android_packages_apps_PackageInstaller-919d56f9a21aa388c08dd32c99e7b47b4637e96a.tar.bz2 android_packages_apps_PackageInstaller-919d56f9a21aa388c08dd32c99e7b47b4637e96a.zip | |
Merge "Always set permission policy to fixed" into mnc-dev
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java b/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java index df98d690..aaa65f9e 100644 --- a/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java +++ b/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java @@ -120,15 +120,15 @@ public class GrantPermissionsActivity extends OverlayTouchActivity case DevicePolicyManager.PERMISSION_POLICY_AUTO_GRANT: { if (!group.areRuntimePermissionsGranted()) { group.grantRuntimePermissions(false); - group.setPolicyFixed(); } + group.setPolicyFixed(); } break; case DevicePolicyManager.PERMISSION_POLICY_AUTO_DENY: { - if (!group.areRuntimePermissionsGranted()) { + if (group.areRuntimePermissionsGranted()) { group.revokeRuntimePermissions(false); - group.setPolicyFixed(); } + group.setPolicyFixed(); } break; default: { |