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

Merge change 20945

Browse Source 
* changes:
  contrary to popular belief ContentResolver.query can return null. so check.
This commit is contained in:
Android (Google) Code Review
2009-08-12 10:10:47 -07:00
parent 4448740490 93187560b5
commit b5a72b0e14
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/com/android/internal/widget/ContactHeaderWidget.java
View File

@@ -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);