commit 085c288f87389fd08295a941e568a56fd2f11a00
author Android (Google) Code Review <android-gerrit@google.com> Tue Jul 14 16:24:11 2009 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jul 14 16:24:11 2009 -0700
tree d0902d9a5ca97c6066991784e8f04aa60e955cea
parent d7b2f66611a7f38c96d7410744ddc0bab9463c18
parent b462fe3d6fce9489f16dc7f9f37b83ddcdbc2ce6

Merge change 6819 into donut

* changes:
  Use correct photo when building direct-dial shortcuts.

src/com/android/contacts/ContactsListActivity.java

diff --git a/src/com/android/contacts/ContactsListActivity.java b/src/com/android/contacts/ContactsListActivity.java
index 51363be..2cc5758 100644
--- a/src/com/android/contacts/ContactsListActivity.java
+++ b/src/com/android/contacts/ContactsListActivity.java
@@ -1163,7 +1163,9 @@
                 Uri phoneUri = Uri.fromParts(scheme, number, null);
                 shortcutIntent = new Intent(mShortcutAction, phoneUri);
                 
-                Uri personUri = ContentUris.withAppendedId(People.CONTENT_URI, id);
+                // Find the People._ID for this phone number
+                final long personId = c.getLong(PHONES_PERSON_ID_INDEX);
+                Uri personUri = ContentUris.withAppendedId(People.CONTENT_URI, personId);
                 intent.putExtra(Intent.EXTRA_SHORTCUT_ICON,
                         generatePhoneNumberIcon(personUri, type, resid));