diff options
| author | Marcos Marado <mmarado@cyngn.com> | 2014-10-21 11:09:10 +0100 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2014-10-27 18:56:22 +0000 |
| commit | 1c50eaba8c1f0d2fbac33d8187eefc982c711f36 (patch) | |
| tree | 351d5291c3d39605e0d89b6b3a1a332060e2764b | |
| parent | 0cbd4e195ec22f31c0d4be21e325a1673fa9fa99 (diff) | |
| download | packages_apps_ContactsCommon-1c50eaba8c1f0d2fbac33d8187eefc982c711f36.tar.gz packages_apps_ContactsCommon-1c50eaba8c1f0d2fbac33d8187eefc982c711f36.tar.bz2 packages_apps_ContactsCommon-1c50eaba8c1f0d2fbac33d8187eefc982c711f36.zip | |
Fixing Contacts crash when trying to merge two contacts
* getRawContactId() can return null, so we need to be expecting that
Change-Id: I28cfb32dfda75ca0ebcaa97796ad682551d080bb
| -rw-r--r-- | src/com/android/contacts/common/model/RawContactDeltaList.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/contacts/common/model/RawContactDeltaList.java b/src/com/android/contacts/common/model/RawContactDeltaList.java index b1dbda68..4148cdcf 100644 --- a/src/com/android/contacts/common/model/RawContactDeltaList.java +++ b/src/com/android/contacts/common/model/RawContactDeltaList.java @@ -159,7 +159,7 @@ public class RawContactDeltaList extends ArrayList<RawContactDelta> implements P builder.withValue(AggregationExceptions.RAW_CONTACT_ID1, joinedRawContactId); // we should use each delta's raw contact id, so we can update all the // aggregation exceptions for each pair of raw contacts. - if (delta.getRawContactId() != -1) { + if (delta.getRawContactId() != null && delta.getRawContactId() != -1) { builder.withValue(AggregationExceptions.RAW_CONTACT_ID2, delta.getRawContactId()); } else { |