| commit | 9352b9fb9e0b4023c3bba4349eb9e32dc258b80a | [log] [tgz] |
|---|---|---|
| author | Android (Google) Code Review <android-gerrit@google.com> | Wed Sep 16 00:58:06 2009 -0400 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Sep 16 00:58:06 2009 -0400 |
| tree | b6aadf0dceefa631c31028241743f3c0dbc31fe0 | |
| parent | 610e3595d250f78c857126cd08ef2a82ee650415 [diff] | |
| parent | 42fc2c6f0af1c6d8160e00d7319a1c6fd0258a6f [diff] |
Merge change 25232 into eclair * changes: Fix NPE when provider returns null cursor.
diff --git a/core/java/android/provider/Contacts.java b/core/java/android/provider/Contacts.java index 181a529..667ec5a 100644 --- a/core/java/android/provider/Contacts.java +++ b/core/java/android/provider/Contacts.java
@@ -542,7 +542,7 @@ } return new ByteArrayInputStream(data); } finally { - cursor.close(); + if (cursor != null) cursor.close(); } }