summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSvet Ganov <svetoslavganov@google.com>2015-07-06 15:53:57 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-07-06 15:53:58 +0000
commit01fd766a6a53d62f772f0b9da32655977354f1eb (patch)
tree07407d6de1744cb6c4f9276f29b7e7952896e5f0 /src
parent85c09f356c52c710c47ba69608757964fc7db46d (diff)
parent2855dc9a5fe4c7946242b7dc53dd956ef73fdc33 (diff)
downloadandroid_packages_apps_PackageInstaller-01fd766a6a53d62f772f0b9da32655977354f1eb.tar.gz
android_packages_apps_PackageInstaller-01fd766a6a53d62f772f0b9da32655977354f1eb.tar.bz2
android_packages_apps_PackageInstaller-01fd766a6a53d62f772f0b9da32655977354f1eb.zip
Merge "Consider only dagerous permissions of a group in permission apps screen" into mnc-dev
Diffstat (limited to 'src')
-rw-r--r--src/com/android/packageinstaller/permission/model/PermissionApps.java13
1 files changed, 9 insertions, 4 deletions
diff --git a/src/com/android/packageinstaller/permission/model/PermissionApps.java b/src/com/android/packageinstaller/permission/model/PermissionApps.java
index 9c76f211..8c537155 100644
--- a/src/com/android/packageinstaller/permission/model/PermissionApps.java
+++ b/src/com/android/packageinstaller/permission/model/PermissionApps.java
@@ -159,16 +159,21 @@ public class PermissionApps {
for (int j = 0; j < app.requestedPermissions.length; j++) {
String requestedPerm = app.requestedPermissions[j];
- boolean requestsPermissionInGroup = false;
+ PermissionInfo requestedPermissionInfo = null;
for (PermissionInfo groupPermInfo : groupPermInfos) {
- if (groupPermInfo.name.equals(requestedPerm)) {
- requestsPermissionInGroup = true;
+ if (requestedPerm.equals(groupPermInfo.name)) {
+ requestedPermissionInfo = groupPermInfo;
break;
}
}
- if (!requestsPermissionInGroup) {
+ if (requestedPermissionInfo == null) {
+ continue;
+ }
+
+ if (requestedPermissionInfo.protectionLevel
+ != PermissionInfo.PROTECTION_DANGEROUS) {
continue;
}