From 0437e862005912a1e5bf054769f23ed9cc69f811 Mon Sep 17 00:00:00 2001
From: Andrew Sapperstein <asapperstein@google.com>
Date: Fri, 17 Oct 2014 17:52:13 -0700
Subject: Close directoryCursor. b/17949234

Fixes b/18039002.

Change-Id: I88c23adb63ba64ca9f638086ad1c29a7fb839868
---
 src/com/android/ex/chips/BaseRecipientAdapter.java | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/com/android/ex/chips/BaseRecipientAdapter.java b/src/com/android/ex/chips/BaseRecipientAdapter.java
index 151bdcd..070f7ad 100644
--- a/src/com/android/ex/chips/BaseRecipientAdapter.java
+++ b/src/com/android/ex/chips/BaseRecipientAdapter.java
@@ -321,10 +321,17 @@ public class BaseRecipientAdapter extends BaseAdapter implements Filterable, Acc
                         + existingDestinations.size()
                         + ", remaining limit: " + limit + ") ");
             }
-            final Cursor directoryCursor = mContentResolver.query(
-                    DirectoryListQuery.URI, DirectoryListQuery.PROJECTION,
-                    null, null, null);
-            return setupOtherDirectories(mContext, directoryCursor, mAccount);
+            Cursor directoryCursor = null;
+            try {
+                directoryCursor = mContentResolver.query(
+                        DirectoryListQuery.URI, DirectoryListQuery.PROJECTION,
+                        null, null, null);
+                return setupOtherDirectories(mContext, directoryCursor, mAccount);
+            } finally {
+                if (directoryCursor != null) {
+                    directoryCursor.close();
+                }
+            }
         } else {
             // We don't need to search other directories.
             return null;
-- 
cgit v1.2.3