Merge "Skip importing empty SIM phone numbers" into ub-contactsdialer-h-dev
diff --git a/res/values/strings.xml b/res/values/strings.xml
index adfaaab..1615cf7 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1884,8 +1884,8 @@
when the window is first opened [CHAR LIMIT=40] -->
<string name="sim_import_title">Import from SIM</string>
- <!-- Content description of the cancel navigation icon shown in SIM import screen toolbar -->
- <string name="sim_import_cancel_content_description">Cancel import</string>
+ <!-- Content description of the cancel navigation icon shown in SIM import screen toolbar [CHAR LIMIT=NONE]-->
+ <string name="sim_import_cancel_content_description">Cancel</string>
<!-- Alert for letting user know that their device auto-sync setting is turned off,
in case they are wondering why they are not seeing any contact. [CHAR LIMIT=150] -->
diff --git a/src/com/android/contacts/editor/AggregationSuggestionEngine.java b/src/com/android/contacts/editor/AggregationSuggestionEngine.java
index ecd963b..42776ff 100644
--- a/src/com/android/contacts/editor/AggregationSuggestionEngine.java
+++ b/src/com/android/contacts/editor/AggregationSuggestionEngine.java
@@ -207,10 +207,6 @@
appendValue(nameSb, values, StructuredName.FAMILY_NAME);
appendValue(nameSb, values, StructuredName.SUFFIX);
- if (nameSb.length() == 0) {
- appendValue(nameSb, values, StructuredName.DISPLAY_NAME);
- }
-
StringBuilder phoneticNameSb = new StringBuilder();
appendValue(phoneticNameSb, values, StructuredName.PHONETIC_FAMILY_NAME);
appendValue(phoneticNameSb, values, StructuredName.PHONETIC_MIDDLE_NAME);