diff options
author | Svet Ganov <svetoslavganov@google.com> | 2016-02-22 15:57:47 -0800 |
---|---|---|
committer | Svet Ganov <svetoslavganov@google.com> | 2016-02-22 16:05:57 -0800 |
commit | e2db995fe51c8bbc452f3be47b6ef1a483301748 (patch) | |
tree | 64b0ab1af9b2f80f86a47f6b54a8fe9ded4ed77b /src | |
parent | 8c73974b359e24d797ab57a1c3db17f5474d1b63 (diff) | |
download | android_packages_apps_PackageInstaller-e2db995fe51c8bbc452f3be47b6ef1a483301748.tar.gz android_packages_apps_PackageInstaller-e2db995fe51c8bbc452f3be47b6ef1a483301748.tar.bz2 android_packages_apps_PackageInstaller-e2db995fe51c8bbc452f3be47b6ef1a483301748.zip |
Show permissions grant UI in requested order
bug:23314383
Change-Id: I4b41b9941f147eefc5f3fc2c520aba7afabd26a0
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 416bb9ca..c9bd1bea 100644 --- a/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java +++ b/src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java @@ -130,15 +130,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 |