commit 2366ff12a2f251e33412a6e65e4f5642c3a7d59c
author Adam Powell <adamp@google.com> Fri Sep 23 10:32:04 2016 -0700
committer Adam Powell <adamp@google.com> Fri Sep 23 10:36:01 2016 -0700
tree b54fc377c15ce5d9ec7beeb9afe60da3252014b2
parent 18fb24c5d3e8f9e2a66e78f13a7fa2567fbd3231

ResolverComparator transitivity

Fix a bug where ResolverComparator's results were not consistent for
targets that cross profile boundaries.

Bug: 31640894
Change-Id: Ic6bf9512d2c2eb6f8fb7851e18eb9a347db29755

core/java/com/android/internal/app/ResolverComparator.java

diff --git a/core/java/com/android/internal/app/ResolverComparator.java b/core/java/com/android/internal/app/ResolverComparator.java
index 03a3a38..4d4c7ce 100644
--- a/core/java/com/android/internal/app/ResolverComparator.java
+++ b/core/java/com/android/internal/app/ResolverComparator.java
@@ -157,7 +157,10 @@
 
         // We want to put the one targeted to another user at the end of the dialog.
         if (lhs.targetUserId != UserHandle.USER_CURRENT) {
-            return 1;
+            return rhs.targetUserId != UserHandle.USER_CURRENT ? 0 : 1;
+        }
+        if (rhs.targetUserId != UserHandle.USER_CURRENT) {
+            return -1;
         }
 
         if (mHttp) {