Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 1cc86da6: Merge "Don\'t fall through from TOKEN_EMAIL_LOOKUP" into gingerbread

Browse Source 
Merge commit '1cc86da61a361c84ef81e893440c500e33fae312' into gingerbread-plus-aosp

* commit '1cc86da61a361c84ef81e893440c500e33fae312':
  Don't fall through from TOKEN_EMAIL_LOOKUP
This commit is contained in:
Makoto Onuki
2010-09-07 14:34:19 -07:00
committed by Android Git Automerger
parent 75f0024cf4 1cc86da61a
commit 3f6e4d56bb
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/widget/QuickContactBadge.java
View File

@@ -236,6 +236,7 @@ public class QuickContactBadge extends ImageView implements OnClickListener {
trigger = true;
createUri = Uri.fromParts("tel", (String)cookie, null);
//$FALL-THROUGH$
case TOKEN_PHONE_LOOKUP: {
if (cursor != null && cursor.moveToFirst()) {
long contactId = cursor.getLong(PHONE_ID_COLUMN_INDEX);
@@ -249,12 +250,14 @@ public class QuickContactBadge extends ImageView implements OnClickListener {
trigger = true;
createUri = Uri.fromParts("mailto", (String)cookie, null);
//$FALL-THROUGH$
case TOKEN_EMAIL_LOOKUP: {
if (cursor != null && cursor.moveToFirst()) {
long contactId = cursor.getLong(EMAIL_ID_COLUMN_INDEX);
String lookupKey = cursor.getString(EMAIL_LOOKUP_STRING_COLUMN_INDEX);
lookupUri = Contacts.getLookupUri(contactId, lookupKey);
}
break;
}
case TOKEN_CONTACT_LOOKUP_AND_TRIGGER: {