fix a crash when adding a group back to the sync set
in the contacts display groups UI
Change-Id: I9a24b02701628bf8d7495a6734e35a9a4731029e
http://b/issue?id=2522758
diff --git a/src/com/android/contacts/ui/ContactsPreferencesActivity.java b/src/com/android/contacts/ui/ContactsPreferencesActivity.java
index 5fa9fc9..b6a20c7 100644
--- a/src/com/android/contacts/ui/ContactsPreferencesActivity.java
+++ b/src/com/android/contacts/ui/ContactsPreferencesActivity.java
@@ -505,9 +505,15 @@
*/
private static Comparator<GroupDelta> sIdComparator = new Comparator<GroupDelta>() {
public int compare(GroupDelta object1, GroupDelta object2) {
- final long id1 = object1.getId();
- final long id2 = object2.getId();
- if (id1 < id2) {
+ final Long id1 = object1.getId();
+ final Long id2 = object2.getId();
+ if (id1 == null && id2 == null) {
+ return 0;
+ } else if (id1 == null) {
+ return -1;
+ } else if (id2 == null) {
+ return 1;
+ } else if (id1 < id2) {
return -1;
} else if (id1 > id2) {
return 1;