From 54edd1cdc45773dc5c208d9dc4f26b768d200901 Mon Sep 17 00:00:00 2001
From: Esteban Talavera <etalavera@google.com>
Date: Mon, 18 Aug 2014 14:11:47 +0100
Subject: [PATCH] Add cross profile intent in order after intent filter
 resolution

The elements returned by queryIntentActivities must be in order, as specified in the Javadoc. Otherwise the ResolverActivity will incorrectly filter out intents if they follow another intent with lower priority than the ones that will be shown to the user.

Bug: 15906680
Change-Id: I755e05d3017ee124cbae468f51fa86cfdf42b483
---
 .../core/java/com/android/server/pm/PackageManagerService.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index 89bd1d4a589c0..d67daca41f6d6 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -3282,6 +3282,7 @@ public class PackageManagerService extends IPackageManager.Stub {
                         intent, resolvedType, flags, userId);
                 if (resolveInfo != null) {
                     result.add(resolveInfo);
+                    Collections.sort(result, mResolvePrioritySorter);
                 }
                 return result;
             }