Fix contact name is inconsistent between phone and SIM card

- When export contacts to SIM card,phone uses the rawcontact
  name while SIM card uses the data1 as contact name, so
  correct them to keep consistent

CRs-Fixed: 782035

Change-Id: I2272ef520512c979a6313d915352397d401e90f0

1 files changed, 2 insertions, 3 deletions

diff --git a/src/com/android/contacts/common/interactions/ImportExportDialogFragment.java b/src/com/android/contacts/common/interactions/ImportExportDialogFragment.java
index 10e87e53..f069180d 100755
--- a/src/com/android/contacts/common/interactions/ImportExportDialogFragment.java
+++ b/src/com/android/contacts/common/interactions/ImportExportDialogFragment.java
@@ -453,7 +453,8 @@ public class ImportExportDialogFragment extends AnalyticsDialogFragment
                     Iterator<String[]> iterator = contactList.iterator();
                     while (iterator.hasNext() && !canceled && !isAirplaneMode && isSimCardLoaded) {
                         String[] contactInfo = iterator.next();
-                        String name = "";
+                        //contacts name has been existed in contactInfo,so no need query it again
+                        String name = contactInfo[4];
                         ArrayList<String> arrayNumber = new ArrayList<String>();
                         ArrayList<String> arrayEmail = new ArrayList<String>();
 
@@ -475,8 +476,6 @@ public class ImportExportDialogFragment extends AnalyticsDialogFragment
                                     if (!TextUtils.isEmpty(number) && emptyNumber-- >0) {
                                         arrayNumber.add(number);
                                     }
-                                } else if (StructuredName.CONTENT_ITEM_TYPE.equals(mimeType)) {
-                                    name = c.getString(2);
                                 }
                                 if (canSaveEmail) {
                                     if (Email.CONTENT_ITEM_TYPE.equals(mimeType)) {