diff options
| author | Svet Ganov <svetoslavganov@google.com> | 2015-06-12 00:20:06 -0700 |
|---|---|---|
| committer | Svet Ganov <svetoslavganov@google.com> | 2015-06-12 00:25:23 -0700 |
| commit | cd71d9aeabac2e7d5de7a5c84f09d4681411ebb4 (patch) | |
| tree | 08901374664f14002bc6e28ae0c93dde43057702 /src | |
| parent | 92f46d12ea6f5b1a90a06fc5b18440c30f868d91 (diff) | |
| download | android_packages_apps_PackageInstaller-cd71d9aeabac2e7d5de7a5c84f09d4681411ebb4.tar.gz android_packages_apps_PackageInstaller-cd71d9aeabac2e7d5de7a5c84f09d4681411ebb4.tar.bz2 android_packages_apps_PackageInstaller-cd71d9aeabac2e7d5de7a5c84f09d4681411ebb4.zip | |
Requesting granted permission shows grant/revoke UI.
bug:21565838
Change-Id: Ib878d07b7d9bbab1ffe2b64f008e2fe092ead253
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java | 16 | ||||
| -rw-r--r-- | src/com/android/packageinstaller/permission/utils/Utils.java | 1 |
2 files changed, 10 insertions, 7 deletions
diff --git a/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java b/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java index fc9b33c1..ba2a4cd9 100644 --- a/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java +++ b/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java @@ -112,16 +112,18 @@ public class GrantPermissionsActivity extends Activity for (AppPermissionGroup group : mAppPermissions.getPermissionGroups()) { // We allow the user to choose only non-fixed permissions. A permission // is fixed either by device policy or the user denying with prejudice. - if (!group.areRuntimePermissionsGranted() && - !(group.isUserFixed() || group.isPolicyFixed())) { - + if (!group.isUserFixed() && !group.isPolicyFixed()) { switch (permissionPolicy) { case DevicePolicyManager.PERMISSION_POLICY_AUTO_GRANT: { - group.grantRuntimePermissions(false); + if (!group.areRuntimePermissionsGranted()) { + group.grantRuntimePermissions(false); + } } break; case DevicePolicyManager.PERMISSION_POLICY_AUTO_DENY: { - group.revokeRuntimePermissions(false); + if (!group.areRuntimePermissionsGranted()) { + group.revokeRuntimePermissions(false); + } } break; default: { @@ -160,8 +162,8 @@ public class GrantPermissionsActivity extends Activity for (int i = 0; i < groupCount; i++) { GroupState groupState = mRequestGrantPermissionGroups.valueAt(i); - if (!groupState.mGroup.areRuntimePermissionsGranted() - && groupState.mState == GroupState.STATE_UNKNOWN) { + if (/*!groupState.mGroup.areRuntimePermissionsGranted() + && */groupState.mState == GroupState.STATE_UNKNOWN) { CharSequence appLabel = mAppPermissions.getAppLabel(); SpannableString message = new SpannableString(getString( R.string.permission_warning_template, appLabel, diff --git a/src/com/android/packageinstaller/permission/utils/Utils.java b/src/com/android/packageinstaller/permission/utils/Utils.java index 1cd984b1..7600f6c5 100644 --- a/src/com/android/packageinstaller/permission/utils/Utils.java +++ b/src/com/android/packageinstaller/permission/utils/Utils.java @@ -43,6 +43,7 @@ public class Utils { Manifest.permission_group.SMS, Manifest.permission_group.PHONE, Manifest.permission_group.MICROPHONE, + Manifest.permission_group.STORAGE }; private Utils() { |