Suppress inappropriate log around VCardBuilder.

No primary/subprimary ContentValues just means there's no
ContentValues with StructuredName in a given list, so the
log tells completely wrong message to us.

Bug: 3202342
Change-Id: I5a151e850fad9335f2396cfd9edf0750e64462d4

1 files changed, 7 insertions, 4 deletions

diff --git a/java/com/android/vcard/VCardBuilder.java b/java/com/android/vcard/VCardBuilder.java
index 2eec998..7fa9e92 100644
--- a/java/com/android/vcard/VCardBuilder.java
+++ b/java/com/android/vcard/VCardBuilder.java
@@ -255,7 +255,8 @@ public class VCardBuilder {
                 TextUtils.isEmpty(displayName));
     }
 
-    private ContentValues getPrimaryContentValue(final List<ContentValues> contentValuesList) {
+    private ContentValues getPrimaryContentValueWithStructuredName(
+            final List<ContentValues> contentValuesList) {
         ContentValues primaryContentValues = null;
         ContentValues subprimaryContentValues = null;
         for (ContentValues contentValues : contentValuesList) {
@@ -288,7 +289,7 @@ public class VCardBuilder {
                 // We choose the first ContentValues if any "primary" ContentValues does not exist.
                 primaryContentValues = subprimaryContentValues;
             } else {
-                Log.e(LOG_TAG, "All ContentValues given from database is empty.");
+                // There's no appropriate ContentValue with StructuredName.
                 primaryContentValues = new ContentValues();
             }
         }
@@ -319,7 +320,8 @@ public class VCardBuilder {
         //
         // e.g. How to handle non-empty phonetic names with empty structured names?
 
-        final ContentValues contentValues = getPrimaryContentValue(contentValuesList);
+        final ContentValues contentValues =
+                getPrimaryContentValueWithStructuredName(contentValuesList);
         String familyName = contentValues.getAsString(StructuredName.FAMILY_NAME);
         final String middleName = contentValues.getAsString(StructuredName.MIDDLE_NAME);
         final String givenName = contentValues.getAsString(StructuredName.GIVEN_NAME);
@@ -422,7 +424,8 @@ public class VCardBuilder {
             return this;
         }
 
-        final ContentValues contentValues = getPrimaryContentValue(contentValuesList);
+        final ContentValues contentValues =
+                getPrimaryContentValueWithStructuredName(contentValuesList);
         final String familyName = contentValues.getAsString(StructuredName.FAMILY_NAME);
         final String middleName = contentValues.getAsString(StructuredName.MIDDLE_NAME);
         final String givenName = contentValues.getAsString(StructuredName.GIVEN_NAME);