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

am 2f77ffb0: Merge change 25503 into eclair

Browse Source 
Merge commit '2f77ffb087892f9474b35cb019f593025653e492' into eclair-plus-aosp

* commit '2f77ffb087892f9474b35cb019f593025653e492':
  Don't crash if the cursor is null.
This commit is contained in:
Jeff Hamilton
2009-09-17 10:23:21 -07:00
committed by Android Git Automerger
parent 036e2c3433 2f77ffb087
commit bd2c930e1a
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/provider/Contacts.java
View File

@@ -533,7 +533,7 @@ public class Contacts {
Uri photoUri = Uri.withAppendedPath(person, Contacts.Photos.CONTENT_DIRECTORY); Uri photoUri = Uri.withAppendedPath(person, Contacts.Photos.CONTENT_DIRECTORY);
Cursor cursor = cr.query(photoUri, new String[]{Photos.DATA}, null, null, null); Cursor cursor = cr.query(photoUri, new String[]{Photos.DATA}, null, null, null);
try { try {
if (!cursor.moveToNext()) { if (cursor == null || !cursor.moveToNext()) {
return null; return null;
} }
byte[] data = cursor.getBlob(0); byte[] data = cursor.getBlob(0);