diff options
| author | Svetoslav Ganov <svetoslavganov@google.com> | 2016-02-23 00:06:56 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-02-23 00:06:56 +0000 |
| commit | 3a26404b838fadcc64bbe371826cdcc903ffc239 (patch) | |
| tree | bf3160ed8323da02463c139c7f497f8620496c74 /src | |
| parent | 00b8a26bb6a620c36137f77a46bfa81d3c0657fc (diff) | |
| parent | e2db995fe51c8bbc452f3be47b6ef1a483301748 (diff) | |
| download | android_packages_apps_PackageInstaller-3a26404b838fadcc64bbe371826cdcc903ffc239.tar.gz android_packages_apps_PackageInstaller-3a26404b838fadcc64bbe371826cdcc903ffc239.tar.bz2 android_packages_apps_PackageInstaller-3a26404b838fadcc64bbe371826cdcc903ffc239.zip | |
Merge "Show permissions grant UI in requested order" into nyc-dev
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java b/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java index 415d99bc..944db9a3 100644 --- a/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java +++ b/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java @@ -131,15 +131,15 @@ public class GrantPermissionsActivity extends OverlayTouchActivity } }); - for (AppPermissionGroup group : mAppPermissions.getPermissionGroups()) { - boolean groupHasRequestedPermission = false; - for (String requestedPermission : mRequestedPermissions) { - if (group.hasPermission(requestedPermission)) { - groupHasRequestedPermission = true; + for (String requestedPermission : mRequestedPermissions) { + AppPermissionGroup group = null; + for (AppPermissionGroup nextGroup : mAppPermissions.getPermissionGroups()) { + if (nextGroup.hasPermission(requestedPermission)) { + group = nextGroup; break; } } - if (!groupHasRequestedPermission) { + if (group == null) { continue; } // We allow the user to choose only non-fixed permissions. A permission |