From 42fc2c6f0af1c6d8160e00d7319a1c6fd0258a6f Mon Sep 17 00:00:00 2001
From: Jeff Sharkey <jsharkey@android.com>
Date: Tue, 15 Sep 2009 13:50:31 -0700
Subject: Fix NPE when provider returns null cursor.

Fixes http://b/2051283
---
 core/java/android/provider/Contacts.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/java/android/provider/Contacts.java b/core/java/android/provider/Contacts.java
index 181a52940d81..667ec5ad284d 100644
--- a/core/java/android/provider/Contacts.java
+++ b/core/java/android/provider/Contacts.java
@@ -542,7 +542,7 @@ public class Contacts {
                 }
                 return new ByteArrayInputStream(data);
             } finally {
-                cursor.close();
+                if (cursor != null) cursor.close();
             }
         }
 
-- 
cgit v1.2.3-59-g8ed1b