From e2db995fe51c8bbc452f3be47b6ef1a483301748 Mon Sep 17 00:00:00 2001
From: Svet Ganov <svetoslavganov@google.com>
Date: Mon, 22 Feb 2016 15:57:47 -0800
Subject: Show permissions grant UI in requested order

bug:23314383

Change-Id: I4b41b9941f147eefc5f3fc2c520aba7afabd26a0
---
 .../permission/ui/GrantPermissionsActivity.java              | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/com/android/packageinstaller/permission/ui')

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
-- 
cgit v1.2.3