ResolverComparator transitivity

am: 2366ff12a2 Change-Id: I8de9805eab7617a952579ff0c82616c0923e5513
2016-09-23 20:39:49 +00:00
parent e61535ac8f 2366ff12a2
commit e698d8bfea
1 changed files with 4 additions and 1 deletions
--- a/core/java/com/android/internal/app/ResolverComparator.java
+++ b/core/java/com/android/internal/app/ResolverComparator.java
@@ -157,7 +157,10 @@ class ResolverComparator implements Comparator<ResolvedComponentInfo> {

        // 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) {