diff options
| author | Makoto Onuki <omakoto@google.com> | 2010-09-07 14:31:34 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-09-07 14:31:34 -0700 |
| commit | 1cc86da61a361c84ef81e893440c500e33fae312 (patch) | |
| tree | 489da500032e9c41ea86341ce5fbafc8da65ae10 | |
| parent | 6e86915e8f5dfffa60ae5d1a4ca9aa74912fd026 (diff) | |
| parent | a362e1d79492cf3a60724a259fcd6d786574d5d6 (diff) | |
| download | frameworks_base-1cc86da61a361c84ef81e893440c500e33fae312.zip frameworks_base-1cc86da61a361c84ef81e893440c500e33fae312.tar.gz frameworks_base-1cc86da61a361c84ef81e893440c500e33fae312.tar.bz2 | |
Merge "Don't fall through from TOKEN_EMAIL_LOOKUP" into gingerbread
| -rw-r--r-- | core/java/android/widget/QuickContactBadge.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/widget/QuickContactBadge.java b/core/java/android/widget/QuickContactBadge.java index 07c3e4b..4bbb540 100644 --- a/core/java/android/widget/QuickContactBadge.java +++ b/core/java/android/widget/QuickContactBadge.java @@ -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: { |