commit 9690cd4eccf9294a326a13a7e46dfdcd6ce7eff5
author Android (Google) Code Review <android-gerrit@google.com> Tue Jul 14 16:25:09 2009 -0700
committer The Android Open Source Project <initial-contribution@android.com> Tue Jul 14 16:25:09 2009 -0700
tree 2f3cce7e98401e5ec79f24c2b75f39282be43f65
parent f50e6e5bcde8efda1660b8e456350eaf1874b39d
parent 085c288f87389fd08295a941e568a56fd2f11a00

am 085c288f: Merge change 6819 into donut

Merge commit '085c288f87389fd08295a941e568a56fd2f11a00'

* commit '085c288f87389fd08295a941e568a56fd2f11a00':
  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 712a794..922131b 100644
--- a/src/com/android/contacts/ContactsListActivity.java
+++ b/src/com/android/contacts/ContactsListActivity.java
@@ -1165,7 +1165,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));