am 22d7142d: am 1b679754: am 58c9a4bc: Merge "Don\'t load photo if it\'s id is... (726e838c) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/widget/ContactHeaderWidget.java

+13 −3

Original line number	Diff line number	Diff line
		@@ -269,9 +269,19 @@ public class ContactHeaderWidget extends FrameLayout implements View.OnClickList
		bindContactInfo(cursor);
		Uri lookupUri = Contacts.getLookupUri(cursor.getLong(ContactQuery._ID),
		cursor.getString(ContactQuery.LOOKUP_KEY));
		startPhotoQuery(cursor.getLong(ContactQuery.PHOTO_ID),
		lookupUri, false /* don't reset query handler */);

		final long photoId = cursor.getLong(ContactQuery.PHOTO_ID);

		if (photoId == 0) {
		mPhotoView.setImageBitmap(loadPlaceholderPhoto(null));
		if (cookie != null && cookie instanceof Uri) {
		mPhotoView.assignContactUri((Uri) cookie);
		}
		invalidate();
		} else {
		startPhotoQuery(photoId, lookupUri,
		false /* don't reset query handler */);
		}
		} else {
		// shouldn't really happen
		setDisplayName(null, null);