diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2014-12-09 01:32:03 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-12-09 01:32:03 -0800 |
| commit | 647b3807c4bf1ad3c9f7676889afd3787184a03a (patch) | |
| tree | dabf15cd7d5cd15505edb11d36ca528def4fc86b | |
| parent | 48ac11f76313ff68b12ace43e08c74b94a9052df (diff) | |
| parent | 4b44b2ff620b9372bbcef351a30002300cd18531 (diff) | |
| download | packages_apps_Contacts-647b3807c4bf1ad3c9f7676889afd3787184a03a.tar.gz packages_apps_Contacts-647b3807c4bf1ad3c9f7676889afd3787184a03a.tar.bz2 packages_apps_Contacts-647b3807c4bf1ad3c9f7676889afd3787184a03a.zip | |
Merge "Add null judge when import contacts from SIM card"
| -rwxr-xr-x[-rw-r--r--] | src/com/android/contacts/editor/MultiPickContactActivity.java | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/src/com/android/contacts/editor/MultiPickContactActivity.java b/src/com/android/contacts/editor/MultiPickContactActivity.java index e01074b9a..4a65bc28a 100644..100755 --- a/src/com/android/contacts/editor/MultiPickContactActivity.java +++ b/src/com/android/contacts/editor/MultiPickContactActivity.java @@ -1613,19 +1613,23 @@ public class MultiPickContactActivity extends ListActivity implements } operationList.add(builder.build()); - builder = ContentProviderOperation.newInsert(Data.CONTENT_URI); - builder.withValueBackReference(StructuredName.RAW_CONTACT_ID, 0); - builder.withValue(Data.MIMETYPE, StructuredName.CONTENT_ITEM_TYPE); - builder.withValue(StructuredName.DISPLAY_NAME, name); - operationList.add(builder.build()); - - builder = ContentProviderOperation.newInsert(Data.CONTENT_URI); - builder.withValueBackReference(Phone.RAW_CONTACT_ID, 0); - builder.withValue(Data.MIMETYPE, Phone.CONTENT_ITEM_TYPE); - builder.withValue(Phone.TYPE, Phone.TYPE_MOBILE); - builder.withValue(Phone.NUMBER, phoneNumber); - builder.withValue(Data.IS_PRIMARY, 1); - operationList.add(builder.build()); + if (!TextUtils.isEmpty(name)) { + builder = ContentProviderOperation.newInsert(Data.CONTENT_URI); + builder.withValueBackReference(StructuredName.RAW_CONTACT_ID, 0); + builder.withValue(Data.MIMETYPE, StructuredName.CONTENT_ITEM_TYPE); + builder.withValue(StructuredName.DISPLAY_NAME, name); + operationList.add(builder.build()); + } + + if (!TextUtils.isEmpty(phoneNumber)) { + builder = ContentProviderOperation.newInsert(Data.CONTENT_URI); + builder.withValueBackReference(Phone.RAW_CONTACT_ID, 0); + builder.withValue(Data.MIMETYPE, Phone.CONTENT_ITEM_TYPE); + builder.withValue(Phone.TYPE, Phone.TYPE_MOBILE); + builder.withValue(Phone.NUMBER, phoneNumber); + builder.withValue(Data.IS_PRIMARY, 1); + operationList.add(builder.build()); + } if (anrArray != null) { for (String anr : anrArray) { |