commit 4d81ebbb6c519a4357bf55ce5d391d655616ca9c
author Jay Shrauner <shrauner@google.com> Mon Dec 01 06:21:35 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Dec 01 06:21:37 2014 +0000
tree 629a18e562f3e9440e16392d0785194c28bbd330
parent 76c1a51953eccb49eb843e9aee0cbc2f23451042
parent 568f4e72711908455ccd20fbb04c1017b10d7e1c

Merge "Fix NPE in getInsertedRawContactId" into lmp-mr1-dev

src/com/android/contacts/list/JoinContactListFragment.java

diff --git a/src/com/android/contacts/list/JoinContactListFragment.java b/src/com/android/contacts/list/JoinContactListFragment.java
index 3e42fdf..89b02da 100644
--- a/src/com/android/contacts/list/JoinContactListFragment.java
+++ b/src/com/android/contacts/list/JoinContactListFragment.java
@@ -129,7 +129,9 @@
     private void showTargetContactName(String displayName) {
         Activity activity = getActivity();
         TextView blurbView = (TextView) activity.findViewById(R.id.join_contact_blurb);
-        String blurb = activity.getString(R.string.blurbJoinContactDataWith, displayName);
+        final String name = !TextUtils.isEmpty(displayName) ? displayName
+            : activity.getString(R.string.missing_name);
+        String blurb = activity.getString(R.string.blurbJoinContactDataWith, name);
         blurbView.setText(blurb);
     }