summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Sapperstein <asapperstein@google.com>2014-10-18 01:01:00 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-18 01:01:00 +0000
commit41507c1f2454467439696bb8c1892425f37bdefd (patch)
treec01265fc4693d2dcdcdd05c76bbcc0d62d954b0a
parent51c3d79d20a97ebd03062c9092e496243a4d54cc (diff)
parent0437e862005912a1e5bf054769f23ed9cc69f811 (diff)
downloadandroid_frameworks_opt_chips-41507c1f2454467439696bb8c1892425f37bdefd.tar.gz
android_frameworks_opt_chips-41507c1f2454467439696bb8c1892425f37bdefd.tar.bz2
android_frameworks_opt_chips-41507c1f2454467439696bb8c1892425f37bdefd.zip
am 0437e862: Close directoryCursor. b/17949234
* commit '0437e862005912a1e5bf054769f23ed9cc69f811': Close directoryCursor. b/17949234
-rw-r--r--src/com/android/ex/chips/BaseRecipientAdapter.java15
1 files 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;