Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1006c842 authored by Makoto Onuki's avatar Makoto Onuki Committed by Android Git Automerger
Browse files

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

Merge commit '3f6e4d56'

* commit '3f6e4d56':
  Don't fall through from TOKEN_EMAIL_LOOKUP
parents d0438da0 3f6e4d56

core/java/android/widget/QuickContactBadge.java

+3 −0
Original line number Original line Diff line number Diff line
@@ -247,6 +247,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);
@@ -260,12 +261,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: {