From fc03aa78943e66c0e0f3358fc73cf3dcf28894dd Mon Sep 17 00:00:00 2001 From: Mark Wagner Date: Mon, 3 Aug 2009 13:36:57 -0700 Subject: [PATCH] check return value from Cursor.moveToFirst() --- .../internal/widget/ContactHeaderWidget.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/core/java/com/android/internal/widget/ContactHeaderWidget.java b/core/java/com/android/internal/widget/ContactHeaderWidget.java index 94d4edc9bd769..ccb537ac8ad37 100644 --- a/core/java/com/android/internal/widget/ContactHeaderWidget.java +++ b/core/java/com/android/internal/widget/ContactHeaderWidget.java @@ -225,9 +225,10 @@ public class ContactHeaderWidget extends FrameLayout implements View.OnClickList c = mContentResolver.query(Uri.withAppendedPath( RawContacts.CONTENT_FILTER_EMAIL_URI, Uri.encode(emailAddress)), EMAIL_LOOKUP_PROJECTION, null, null, null); - c.moveToFirst(); - long contactId = c.getLong(EMAIL_LOOKUP_CONTACT_ID_COLUMN_INDEX); - bindFromContactId(contactId); + if (c.moveToFirst()) { + long contactId = c.getLong(EMAIL_LOOKUP_CONTACT_ID_COLUMN_INDEX); + bindFromContactId(contactId); + } } finally { if (c != null) { c.close(); @@ -248,9 +249,10 @@ public class ContactHeaderWidget extends FrameLayout implements View.OnClickList try { c = mContentResolver.query(Uri.withAppendedPath(PhoneLookup.CONTENT_FILTER_URI, number), PHONE_LOOKUP_PROJECTION, null, null, null); - c.moveToFirst(); - long contactId = c.getLong(PHONE_LOOKUP_CONTACT_ID_COLUMN_INDEX); - bindFromContactId(contactId); + if (c.moveToFirst()) { + long contactId = c.getLong(PHONE_LOOKUP_CONTACT_ID_COLUMN_INDEX); + bindFromContactId(contactId); + } } finally { if (c != null) { c.close();