diff options
| author | Ian Pedowitz <ijpedowitz@google.com> | 2015-08-27 01:40:38 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-27 01:40:38 +0000 |
| commit | 844f329ca4c6bc14be5cfcefbdf953d3ba2f65a5 (patch) | |
| tree | 3f0b5f2001c60efd7228c669fa19a3ab41daa930 /src | |
| parent | b9a90048e1e55c1a59ccb43625ae3b359c7215c3 (diff) | |
| parent | 1e6cd17f5abde2e6dd9a28021af5edc977c5b430 (diff) | |
| download | android_packages_apps_PackageInstaller-844f329ca4c6bc14be5cfcefbdf953d3ba2f65a5.tar.gz android_packages_apps_PackageInstaller-844f329ca4c6bc14be5cfcefbdf953d3ba2f65a5.tar.bz2 android_packages_apps_PackageInstaller-844f329ca4c6bc14be5cfcefbdf953d3ba2f65a5.zip | |
am 1e6cd17f: am 919d56f9: Merge "Always set permission policy to fixed" into mnc-dev
* commit '1e6cd17f5abde2e6dd9a28021af5edc977c5b430':
Always set permission policy to fixed
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 3ada752b..922f5430 100644 --- a/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java +++ b/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java @@ -122,15 +122,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: { |