commit 41507c1f2454467439696bb8c1892425f37bdefd
author Andrew Sapperstein <asapperstein@google.com> Sat Oct 18 01:01:00 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sat Oct 18 01:01:00 2014 +0000
tree c01265fc4693d2dcdcdd05c76bbcc0d62d954b0a
parent 51c3d79d20a97ebd03062c9092e496243a4d54cc
parent 0437e862005912a1e5bf054769f23ed9cc69f811

am 0437e862: Close directoryCursor. b/17949234

* commit '0437e862005912a1e5bf054769f23ed9cc69f811':
  Close directoryCursor. b/17949234

src/com/android/ex/chips/BaseRecipientAdapter.java

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 @@
                         + 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;