am 95ebd3bd: Merge change 25847 into eclair

Merge commit '95ebd3bdd08e6ad8e13f2ca094a009fabe25ea81' into eclair-plus-aosp

* commit '95ebd3bdd08e6ad8e13f2ca094a009fabe25ea81':
  Fix http://b/issue?id=2099487
This commit is contained in:
Evan Millar
2009-09-18 16:05:27 -07:00
committed by Android Git Automerger

View File

@ -248,7 +248,9 @@ public class ContactHeaderWidget extends FrameLayout implements View.OnClickList
PHONE_LOOKUP_CONTACT_LOOKUP_KEY_COLUMN_INDEX);
bindFromContactUri(Contacts.getLookupUri(contactId, lookupKey));
} else {
setDisplayName((String) cookie, null);
String phoneNumber = (String) cookie;
setDisplayName(phoneNumber, null);
mPhotoView.assignContactFromPhone(phoneNumber, true);
}
break;
}
@ -259,7 +261,9 @@ public class ContactHeaderWidget extends FrameLayout implements View.OnClickList
EMAIL_LOOKUP_CONTACT_LOOKUP_KEY_COLUMN_INDEX);
bindFromContactUri(Contacts.getLookupUri(contactId, lookupKey));
} else {
setDisplayName((String) cookie, null);
String emailAddress = (String) cookie;
setDisplayName(emailAddress, null);
mPhotoView.assignContactFromEmail(emailAddress, true);
}
break;
}