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

Merge "Don't fall through from TOKEN_EMAIL_LOOKUP" into gingerbread

Browse Source
This commit is contained in:
Makoto Onuki
2010-09-07 14:31:34 -07:00
committed by Android (Google) Code Review
parent 6e86915e8f a362e1d794
commit 1cc86da61a
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; trigger = true;
createUri = Uri.fromParts("tel", (String)cookie, null); createUri = Uri.fromParts("tel", (String)cookie, null);
//$FALL-THROUGH$
case TOKEN_PHONE_LOOKUP: { case TOKEN_PHONE_LOOKUP: {
if (cursor != null && cursor.moveToFirst()) { if (cursor != null && cursor.moveToFirst()) {
long contactId = cursor.getLong(PHONE_ID_COLUMN_INDEX); long contactId = cursor.getLong(PHONE_ID_COLUMN_INDEX);
@@ -249,12 +250,14 @@ public class QuickContactBadge extends ImageView implements OnClickListener {
trigger = true; trigger = true;
createUri = Uri.fromParts("mailto", (String)cookie, null); createUri = Uri.fromParts("mailto", (String)cookie, null);
//$FALL-THROUGH$
case TOKEN_EMAIL_LOOKUP: { case TOKEN_EMAIL_LOOKUP: {
if (cursor != null && cursor.moveToFirst()) { if (cursor != null && cursor.moveToFirst()) {
long contactId = cursor.getLong(EMAIL_ID_COLUMN_INDEX); long contactId = cursor.getLong(EMAIL_ID_COLUMN_INDEX);
String lookupKey = cursor.getString(EMAIL_LOOKUP_STRING_COLUMN_INDEX); String lookupKey = cursor.getString(EMAIL_LOOKUP_STRING_COLUMN_INDEX);
lookupUri = Contacts.getLookupUri(contactId, lookupKey); lookupUri = Contacts.getLookupUri(contactId, lookupKey);
} }
break;
} }
case TOKEN_CONTACT_LOOKUP_AND_TRIGGER: { case TOKEN_CONTACT_LOOKUP_AND_TRIGGER: {