commit 7c0a5c5c9317baa546c054c95a60a87e91fa4ad4
author Marcus Hagerott <mhagerott@google.com> Tue Nov 22 18:53:19 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Nov 22 18:53:19 2016 +0000
tree 127df5866202d4b6084c3fa516cfb816f23037a3
parent 29d8eec4cb8fe618a9f080aacac3e031d470f7ae
parent 8e9e782cb7f15a8bcca3335374f641d5a149a5a2

Fix failing SIM import test
am: 8e9e782cb7

Change-Id: I8bb138217f0ca6d192f49070c06868a024460976

src/com/android/contacts/common/model/SimContact.java

diff --git a/src/com/android/contacts/common/model/SimContact.java b/src/com/android/contacts/common/model/SimContact.java
index 7eeb89f..2d26029 100644
--- a/src/com/android/contacts/common/model/SimContact.java
+++ b/src/com/android/contacts/common/model/SimContact.java
@@ -70,8 +70,8 @@
 
     public void appendCreateContactOperations(List<ContentProviderOperation> ops,
             AccountWithDataSet targetAccount) {
-        // nothing to save.
-        if (mName == null && mPhone == null && mEmails == null) return;
+        // There is nothing to save so skip it.
+        if (!hasName() && !hasPhone() && !hasEmails()) return;
 
         final int rawContactOpIndex = ops.size();
         ops.add(ContentProviderOperation.newInsert(ContactsContract.RawContacts.CONTENT_URI)