Merge "Show permissions grant UI in requested order" into nyc-dev (3a26404b) · Commits · e / os / android_packages_apps_PackageInstaller

src/com/android/packageinstaller/permission/ui/GrantPermissionsActivity.java

+6 −6

Original line number	Diff line number	Diff line
		@@ -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;
		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