PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix exception sorting conversations" into sc-dev

Browse Source
This commit is contained in:
Julia Reynolds
2021-02-19 19:43:01 +00:00
committed by Android (Google) Code Review
parent afaee1a202 85511dbef8
commit 44e53efb52
2 changed files with 39 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/notification/app/ConversationListPreferenceController.java
View File

@@ -163,8 +163,16 @@ public abstract class ConversationListPreferenceController extends AbstractPrefe
return o1.getNotificationChannel().getId().compareTo(
o2.getNotificationChannel().getId());
}
return sCollator.compare(o1.getShortcutInfo().getLabel(),
o2.getShortcutInfo().getLabel());
if (o1.getShortcutInfo().getLabel() == null
&& o2.getShortcutInfo().getLabel() != null) {
return 1;
}
if (o1.getShortcutInfo().getLabel() != null
&& o2.getShortcutInfo().getLabel() == null) {
return -1;
}
return sCollator.compare(o1.getShortcutInfo().getLabel().toString(),
o2.getShortcutInfo().getLabel().toString());
}
};
}