From d9b251d23b30e25cf388fbbc1a9bdbb3f7caeebd Mon Sep 17 00:00:00 2001 From: Marc Blank Date: Mon, 20 Dec 2010 13:58:11 -0800 Subject: [PATCH] Properly return zero-count cursor from getMatrixCursor Change-Id: I574528bf56b5a82ecbaab3d3501b26e7afb974ec --- src/com/android/email/provider/ContentCache.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/com/android/email/provider/ContentCache.java b/src/com/android/email/provider/ContentCache.java index 75e0f52df..d8a9a4f20 100644 --- a/src/com/android/email/provider/ContentCache.java +++ b/src/com/android/email/provider/ContentCache.java @@ -525,6 +525,9 @@ public final class ContentCache extends LinkedHashMap { if (c != null) { // Make a new MatrixCursor with the requested columns MatrixCursor mc = new MatrixCursor(projection, 1); + if (c.getCount() == 0) { + return mc; + } Object[] row = new Object[projection.length]; if (values != null) { // Make a copy; we don't want to change the original