commit 11a9df755a4cfbe81b2488b1d588126166cdaeb8
author Dave Santoro <dsantoro@google.com> Thu Jun 30 11:33:28 2011 -0700
committer Dave Santoro <dsantoro@google.com> Thu Jun 30 11:35:54 2011 -0700
tree 3518ae8d91b8457d2a9980ff575fb44289f2a2f3
parent f4e5dfa30a752ec785b2eecee21c2b620104def2

Fix issue with loading profile photo.

The photo preloader was not requesting that profile data
be included in the query.

Bug 4981384

Change-Id: I9fa1a0ee0a1e9fe3a12fe5d906631ef3365de4dc

src/com/android/contacts/ContactPhotoManager.java

diff --git a/src/com/android/contacts/ContactPhotoManager.java b/src/com/android/contacts/ContactPhotoManager.java
index c57583b..e61d379 100644
--- a/src/com/android/contacts/ContactPhotoManager.java
+++ b/src/com/android/contacts/ContactPhotoManager.java
@@ -627,6 +627,7 @@
                         ContactsContract.DIRECTORY_PARAM_KEY, String.valueOf(Directory.DEFAULT))
                         .appendQueryParameter(ContactsContract.LIMIT_PARAM_KEY,
                                 String.valueOf(MAX_PHOTOS_TO_PRELOAD))
+                        .appendQueryParameter(ContactsContract.ALLOW_PROFILE, "1")
                         .build();
                 cursor = mResolver.query(uri, new String[] { Contacts.PHOTO_ID },
                         Contacts.PHOTO_ID + " NOT NULL AND " + Contacts.PHOTO_ID + "!=0",
@@ -683,7 +684,8 @@
 
             Cursor cursor = null;
             try {
-                cursor = mResolver.query(Data.CONTENT_URI,
+                cursor = mResolver.query(Data.CONTENT_URI.buildUpon()
+                        .appendQueryParameter(ContactsContract.ALLOW_PROFILE, "1").build(),
                         COLUMNS,
                         mStringBuilder.toString(),
                         mPhotoIdsAsStrings.toArray(EMPTY_STRING_ARRAY),