commit cfc00cbcefd2cdeb6637267c2f910749ad2b57e1
author Daniel Lehmann <lehmannd@google.com> Tue Apr 24 11:52:39 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 24 11:52:39 2012 -0700
tree 0803a9c5b121acbf70e29f688177405469a2cd25
parent 7e596e946f09ae50e32cd47f68c65136134a7ed4
parent 9a409d474b2b4f2e4261657f864eeb866fcb8816

Merge "Fix an NPE in PhotoSelectionHandler. mListener was always null"

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

diff --git a/src/com/android/contacts/list/ShortcutIntentBuilder.java b/src/com/android/contacts/list/ShortcutIntentBuilder.java
index 6c593b0..074d7ec 100644
--- a/src/com/android/contacts/list/ShortcutIntentBuilder.java
+++ b/src/com/android/contacts/list/ShortcutIntentBuilder.java
@@ -266,7 +266,12 @@
         Intent intent = new Intent();
         intent.putExtra(Intent.EXTRA_SHORTCUT_ICON, icon);
         intent.putExtra(Intent.EXTRA_SHORTCUT_INTENT, shortcutIntent);
-        intent.putExtra(Intent.EXTRA_SHORTCUT_NAME, displayName);
+        if (TextUtils.isEmpty(displayName)) {
+            intent.putExtra(Intent.EXTRA_SHORTCUT_NAME, mContext.getResources().getString(
+                    R.string.missing_name));
+        } else {
+            intent.putExtra(Intent.EXTRA_SHORTCUT_NAME, displayName);
+        }
 
         mListener.onShortcutIntentCreated(contactUri, intent);
     }