From 842e60fb8bbf13fb785c0b3109e9fe37d611060e Mon Sep 17 00:00:00 2001 From: Tyrone Nicholas Date: Fri, 10 Jul 2015 09:55:03 -0700 Subject: [PATCH] Close the cursor in the comparison app --- .../samples/comparison/MainActivity.java | 26 ++++++++++++------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/samples/comparison/src/main/java/com/facebook/samples/comparison/MainActivity.java b/samples/comparison/src/main/java/com/facebook/samples/comparison/MainActivity.java index fc56b34689..5efb19e1ce 100644 --- a/samples/comparison/src/main/java/com/facebook/samples/comparison/MainActivity.java +++ b/samples/comparison/src/main/java/com/facebook/samples/comparison/MainActivity.java @@ -336,18 +336,26 @@ public void onFinish(List result) { private void loadLocalUrls() { Uri externalContentUri = MediaStore.Images.Media.EXTERNAL_CONTENT_URI; String[] projection = {MediaStore.Images.Media._ID}; - Cursor cursor = getContentResolver().query(externalContentUri, projection, null, null, null); - mImageUrls.clear(); + Cursor cursor = null; + try { + cursor = getContentResolver().query(externalContentUri, projection, null, null, null); - int columnIndex = cursor.getColumnIndexOrThrow(MediaStore.Images.Media._ID); + mImageUrls.clear(); - String imageId; - Uri imageUri; - while (cursor.moveToNext()) { - imageId = cursor.getString(columnIndex); - imageUri = Uri.withAppendedPath(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, imageId); - mImageUrls.add(imageUri.toString()); + int columnIndex = cursor.getColumnIndexOrThrow(MediaStore.Images.Media._ID); + + String imageId; + Uri imageUri; + while (cursor.moveToNext()) { + imageId = cursor.getString(columnIndex); + imageUri = Uri.withAppendedPath(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, imageId); + mImageUrls.add(imageUri.toString()); + } + } finally { + if (cursor != null) { + cursor.close(); + } } }