diff options
| author | Ian Pedowitz <ijpedowitz@google.com> | 2015-08-27 01:32:36 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-27 01:32:36 +0000 |
| commit | 1e6cd17f5abde2e6dd9a28021af5edc977c5b430 (patch) | |
| tree | a3d0b9d30ee480f2ddb8daef90151cab6396b147 /src | |
| parent | 372aad9e815985e6e6d3fee13292f64f5085756d (diff) | |
| parent | 919d56f9a21aa388c08dd32c99e7b47b4637e96a (diff) | |
| download | android_packages_apps_PackageInstaller-1e6cd17f5abde2e6dd9a28021af5edc977c5b430.tar.gz android_packages_apps_PackageInstaller-1e6cd17f5abde2e6dd9a28021af5edc977c5b430.tar.bz2 android_packages_apps_PackageInstaller-1e6cd17f5abde2e6dd9a28021af5edc977c5b430.zip | |
am 919d56f9: Merge "Always set permission policy to fixed" into mnc-dev
* commit '919d56f9a21aa388c08dd32c99e7b47b4637e96a':
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 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: { |