Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 647b3807 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Add null judge when import contacts from SIM card"

parents 48ac11f7 4b44b2ff

src/com/android/contacts/editor/MultiPickContactActivity.java

100644 → 100755
+17 −13
Original line number Diff line number Diff line
@@ -1613,12 +1613,15 @@ public class MultiPickContactActivity extends ListActivity implements 
        }

        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);
@@ -1626,6 +1629,7 @@ public class MultiPickContactActivity extends ListActivity implements 
            builder.withValue(Phone.NUMBER, phoneNumber);

            builder.withValue(Data.IS_PRIMARY, 1);

            operationList.add(builder.build());

        }



        if (anrArray != null) {

            for (String anr : anrArray) {