diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-08-12 10:10:47 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-08-12 10:10:47 -0700 |
| commit | b5a72b0e14aefb658695bed8d2b598b701abaf3d (patch) | |
| tree | 2e50a749a7cd24331276a55b0ffeff94d6793d80 /core | |
| parent | 444874049075a6f1a921555083881071a02fc955 (diff) | |
| parent | 93187560b5130594901a723ff8023da4913db3a9 (diff) | |
| download | frameworks_base-b5a72b0e14aefb658695bed8d2b598b701abaf3d.zip frameworks_base-b5a72b0e14aefb658695bed8d2b598b701abaf3d.tar.gz frameworks_base-b5a72b0e14aefb658695bed8d2b598b701abaf3d.tar.bz2 | |
Merge change 20945
* changes:
contrary to popular belief ContentResolver.query can return null. so check.
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/com/android/internal/widget/ContactHeaderWidget.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/com/android/internal/widget/ContactHeaderWidget.java b/core/java/com/android/internal/widget/ContactHeaderWidget.java index eac5d2d..58fa0ba 100644 --- a/core/java/com/android/internal/widget/ContactHeaderWidget.java +++ b/core/java/com/android/internal/widget/ContactHeaderWidget.java @@ -270,7 +270,7 @@ 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); - if (c.moveToFirst()) { + if (c != null && c.moveToFirst()) { long contactId = c.getLong(EMAIL_LOOKUP_CONTACT_ID_COLUMN_INDEX); bindFromContactId(contactId); } else { @@ -296,7 +296,7 @@ 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); - if (c.moveToFirst()) { + if (c != null && c.moveToFirst()) { long contactId = c.getLong(PHONE_LOOKUP_CONTACT_ID_COLUMN_INDEX); bindFromContactId(contactId); } else { @@ -408,7 +408,7 @@ public class ContactHeaderWidget extends FrameLayout implements View.OnClickList new String[] { Photo.PHOTO }, null, null, null); - if (photoCursor.moveToFirst() && !photoCursor.isNull(0)) { + if (photoCursor != null && photoCursor.moveToFirst() && !photoCursor.isNull(0)) { byte[] photoData = photoCursor.getBlob(0); photoBm = BitmapFactory.decodeByteArray(photoData, 0, photoData.length, options); |