Merge "ResolverComparator transitivity" into nyc-mr1-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
df7f4a13d7
@@ -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.
|
// We want to put the one targeted to another user at the end of the dialog.
|
||||||
if (lhs.targetUserId != UserHandle.USER_CURRENT) {
|
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) {
|
if (mHttp) {
|
||||||
|
|||||||
Reference in New Issue
Block a user