commit 2f55f8efc28307835b93bff9a0e78a5a76946863
author Daniel Lehmann <lehmannd@google.com> Mon Oct 11 13:17:48 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Oct 11 13:17:48 2010 -0700
tree f5fe4fd31134240b6124f14d06b58ecbffda13b0
parent 3d0ee4245cb5a2652e5f632a7ef12007bc303f33
parent a51f8e974d1515700ebbb545af107668123ba8ba

Merge "Fix a Cursor leak if cursor doesn't have any content" into gingerbread

src/com/android/contacts/ContactsListActivity.java

diff --git a/src/com/android/contacts/ContactsListActivity.java b/src/com/android/contacts/ContactsListActivity.java
index a53f469..719bb25 100644
--- a/src/com/android/contacts/ContactsListActivity.java
+++ b/src/com/android/contacts/ContactsListActivity.java
@@ -2687,8 +2687,11 @@
                 new String[] {Phone._ID, Phone.NUMBER, Phone.IS_SUPER_PRIMARY,
                         RawContacts.ACCOUNT_TYPE, Phone.TYPE, Phone.LABEL},
                 Data.MIMETYPE + "=?", new String[] {Phone.CONTENT_ITEM_TYPE}, null);
-        if (c != null && c.moveToFirst()) {
-            return c;
+        if (c != null) {
+            if (c.moveToFirst()) {
+                return c;
+            }
+            c.close();
         }
         return null;
     }