| commit | 91740d8ee86686f76f11f07ba94f2ce8b183dc55 | [log] [tgz] |
|---|---|---|
| author | Paul Soulos <psoulos@google.com> | Wed Jul 02 14:55:17 2014 -0400 |
| committer | Paul Soulos <psoulos@google.com> | Wed Jul 02 18:55:57 2014 +0000 |
| tree | 24b1131490489f61d371a68e4ec4dbc50b0eeb69 | |
| parent | 949d3fb9e459c67b48ee3ce015e4c9ff186e8e44 [diff] [blame] |
Fixes bug in merging DataItems for collapse Change-Id: I87eb2b4eab5af1b71cc47edf2471824c83b45d4a
diff --git a/src/com/android/contacts/common/model/dataitem/DataItem.java b/src/com/android/contacts/common/model/dataitem/DataItem.java index a209ac9..1726f40 100644 --- a/src/com/android/contacts/common/model/dataitem/DataItem.java +++ b/src/com/android/contacts/common/model/dataitem/DataItem.java
@@ -191,6 +191,7 @@ // If this does not have a label and that does, or if that's label is higher precedence, // use that's label if ((!hasKindTypeColumn(thisKind) && that.hasKindTypeColumn(thatKind)) || + that.hasKindTypeColumn(thatKind) && RawContactModifier.getTypePrecedence(thisKind, getKindTypeColumn(thisKind)) > RawContactModifier.getTypePrecedence(thatKind, that.getKindTypeColumn(thatKind))) {