commit 40ffd4a60dafc600647fc6acdaedaffcd460cdf3
author guanxiongliu <guanxiongliu@google.com> Wed Mar 30 02:25:56 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Mar 30 02:25:56 2016 +0000
tree ef567fb0459918b7f277c41acb1f1008c207a93a
parent 52127644cd35df942c38d889a716e82615c44eb8
parent 5bf5b1762a31192d4dee513a46d7864327b65422

Merge "Using Intent display name to create shortcut" into nyc-dev
am: 5bf5b17

* commit '5bf5b1762a31192d4dee513a46d7864327b65422':
  Using Intent display name to create shortcut

Change-Id: I5c691410dd8a883477a1cd88cc6168808179a898

src/com/android/contacts/quickcontact/QuickContactActivity.java

diff --git a/src/com/android/contacts/quickcontact/QuickContactActivity.java b/src/com/android/contacts/quickcontact/QuickContactActivity.java
index 4d6aa41..5469c2e 100644
--- a/src/com/android/contacts/quickcontact/QuickContactActivity.java
+++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java
@@ -2719,7 +2719,8 @@
 
                         // Send a toast to give feedback to the user that a shortcut to this
                         // contact was added to the launcher.
-                        final String displayName = mContactData.getDisplayName();
+                        final String displayName = shortcutIntent
+                                .getStringExtra(Intent.EXTRA_SHORTCUT_NAME);
                         final String toastMessage = TextUtils.isEmpty(displayName)
                                 ? getString(R.string.createContactShortcutSuccessful_NoName)
                                 : getString(R.string.createContactShortcutSuccessful, displayName);