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

Commit 0d53352b authored by Tingting Wang's avatar Tingting Wang
Browse files

Fix NPE in ImportVcardActivity. 

Change-Id: I32869413d6d9a95465bc09bb36870245e15b1bef
parent 68909452

src/com/android/contacts/common/vcard/ImportVCardActivity.java

+4 −1
Original line number Diff line number Diff line
@@ -405,6 +405,9 @@ public class ImportVCardActivity extends Activity { 
    }



    private String getDisplayName(Uri sourceUri) {

        if (sourceUri == null) {

            return null;

        }

        final ContentResolver resolver = ImportVCardActivity.this.getContentResolver();

        String displayName = null;

        Cursor cursor = null;
@@ -658,8 +661,8 @@ public class ImportVCardActivity extends Activity { 
                    if (uri != null) {

                        Log.i(LOG_TAG, "vCard selected for import: " + uri);

                        final Uri localUri = readUriToLocalUri(uri);

                        final String sourceDisplayName = getDisplayName(uri);

                        if (localUri != null) {

                            final String sourceDisplayName = getDisplayName(uri);

                            importVCard(localUri, sourceDisplayName);

                        } else {

                            Log.w(LOG_TAG, "No local URI for vCard import");