Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 41a62e11: Merge "Do not show normal permissions in sideloading UI" into mnc-dev

Browse Source 
* commit '41a62e111d8de8e64ffc61c176add6cc6217b960':
  Do not show normal permissions in sideloading UI
This commit is contained in:
Svetoslav Ganov
2015-07-23 19:19:38 +00:00
committed by Android Git Automerger
parent c00d2713b9 41a62e111d
commit 586116a59e
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/widget/AppSecurityPermissions.java
View File

@@ -533,6 +533,12 @@ public class AppSecurityPermissions {
int existingReqFlags) { int existingReqFlags) {
final int base = pInfo.protectionLevel & PermissionInfo.PROTECTION_MASK_BASE; final int base = pInfo.protectionLevel & PermissionInfo.PROTECTION_MASK_BASE;
final boolean isNormal = (base == PermissionInfo.PROTECTION_NORMAL); final boolean isNormal = (base == PermissionInfo.PROTECTION_NORMAL);
// We do not show normal permissions in the UI.
if (isNormal) {
return false;
}
final boolean isDangerous = (base == PermissionInfo.PROTECTION_DANGEROUS) final boolean isDangerous = (base == PermissionInfo.PROTECTION_DANGEROUS)
|| ((pInfo.protectionLevel&PermissionInfo.PROTECTION_FLAG_PRE23) != 0); || ((pInfo.protectionLevel&PermissionInfo.PROTECTION_FLAG_PRE23) != 0);
final boolean isRequired = final boolean isRequired =
@@ -546,7 +552,7 @@ public class AppSecurityPermissions {
// Dangerous and normal permissions are always shown to the user if the permission // Dangerous and normal permissions are always shown to the user if the permission
// is required, or it was previously granted // is required, or it was previously granted
if ((isNormal || isDangerous) && (isRequired || wasGranted || isGranted)) { if (isDangerous && (isRequired || wasGranted || isGranted)) {
return true; return true;
} }