drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 4358731c: Merge change 22534 into eclair

Browse Source 
Merge commit '4358731c98929e2d5af70b0c4983a872386569bd' into eclair-plus-aosp

* commit '4358731c98929e2d5af70b0c4983a872386569bd':
  ContactsContract: Fix null pointer exception in openContactPhotoInputStream()
This commit is contained in:
Mike Lockwood
2009-08-24 18:22:44 -07:00
committed by Android Git Automerger
parent 7a47b54f13 4358731c98
commit 9e521c10b3
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/provider/ContactsContract.java
View File

@ -343,7 +343,7 @@ public final class ContactsContract {
Cursor cursor = cr.query(photoUri,
new String[]{ContactsContract.CommonDataKinds.Photo.PHOTO}, null, null, null);
try {
if (!cursor.moveToNext()) {
if (cursor == null || !cursor.moveToNext()) {
return null;
}
byte[] data = cursor.getBlob(0);
@ -352,7 +352,9 @@ public final class ContactsContract {
}
return new ByteArrayInputStream(data);
} finally {
cursor.close();
if (cursor != null) {
cursor.close();
}
}
}
}