Merge "ResolverComparator transitivity" into nyc-mr1-dev

2016-09-23 20:33:52 +00:00
parent dd685cac26 2366ff12a2
commit df7f4a13d7
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) {