diff options
author | Amith Yamasani <yamasani@google.com> | 2015-06-23 19:44:57 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-23 19:44:58 +0000 |
commit | ed16fb4ead9813016cd577cea8a70374e0a2afb4 (patch) | |
tree | a058d252cb33a6480268db311f540090d5c01e04 /src | |
parent | 6304bd3489621f5433a905a45c2097ef95055b71 (diff) | |
parent | 1d3660600282ec2cda1d5eeb114253923eb7dcc7 (diff) | |
download | android_packages_apps_PackageInstaller-ed16fb4ead9813016cd577cea8a70374e0a2afb4.tar.gz android_packages_apps_PackageInstaller-ed16fb4ead9813016cd577cea8a70374e0a2afb4.tar.bz2 android_packages_apps_PackageInstaller-ed16fb4ead9813016cd577cea8a70374e0a2afb4.zip |
Merge "Mark permissions that are auto granted/revoked as policy_fixed" into mnc-dev
Diffstat (limited to 'src')
3 files changed, 23 insertions, 0 deletions
diff --git a/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java b/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java index 7b2de19a..6bd15aff 100644 --- a/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java +++ b/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java @@ -459,6 +459,19 @@ public final class AppPermissionGroup implements Comparable<AppPermissionGroup> return true; } + public void setPolicyFixed() { + final int permissionCount = mPermissions.size(); + for (int i = 0; i < permissionCount; i++) { + Permission permission = mPermissions.valueAt(i); + permission.setPolicyFixed(true); + mPackageManager.updatePermissionFlags(permission.getName(), + mPackageInfo.packageName, + PackageManager.FLAG_PERMISSION_POLICY_FIXED, + PackageManager.FLAG_PERMISSION_POLICY_FIXED, + mUserHandle); + } + } + public List<Permission> getPermissions() { return new ArrayList<>(mPermissions.values()); } diff --git a/src/com/android/packageinstaller/permission/model/Permission.java b/src/com/android/packageinstaller/permission/model/Permission.java index 09c927be..da234bdb 100644 --- a/src/com/android/packageinstaller/permission/model/Permission.java +++ b/src/com/android/packageinstaller/permission/model/Permission.java @@ -96,6 +96,14 @@ public final class Permission { } } + public void setPolicyFixed(boolean policyFixed) { + if (policyFixed) { + mFlags |= PackageManager.FLAG_PERMISSION_POLICY_FIXED; + } else { + mFlags &= ~PackageManager.FLAG_PERMISSION_POLICY_FIXED; + } + } + public boolean shouldRevokeOnUpgrade() { return (mFlags & PackageManager.FLAG_PERMISSION_REVOKE_ON_UPGRADE) != 0; } diff --git a/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java b/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java index 98773f54..29000606 100644 --- a/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java +++ b/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java @@ -119,12 +119,14 @@ public class GrantPermissionsActivity extends Activity case DevicePolicyManager.PERMISSION_POLICY_AUTO_GRANT: { if (!group.areRuntimePermissionsGranted()) { group.grantRuntimePermissions(false); + group.setPolicyFixed(); } } break; case DevicePolicyManager.PERMISSION_POLICY_AUTO_DENY: { if (!group.areRuntimePermissionsGranted()) { group.revokeRuntimePermissions(false); + group.setPolicyFixed(); } } break; |