From 336a0ee90fd1dad9874af752c076523313aa0e6b Mon Sep 17 00:00:00 2001 From: Josh Guilfoyle Date: Fri, 2 Oct 2009 15:39:10 -0700 Subject: [PATCH] Fixed issue #4098: Ringtone#getTitle does not close its cursor. http://code.google.com/p/android/issues/detail?id=4098 --- media/java/android/media/Ringtone.java | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/media/java/android/media/Ringtone.java b/media/java/android/media/Ringtone.java index e80d8aaf984a..171332431119 100644 --- a/media/java/android/media/Ringtone.java +++ b/media/java/android/media/Ringtone.java @@ -137,11 +137,17 @@ public class Ringtone { cursor = res.query(uri, MEDIA_COLUMNS, null, null, null); } - if (cursor != null && cursor.getCount() == 1) { - cursor.moveToFirst(); - return cursor.getString(2); - } else { - title = uri.getLastPathSegment(); + try { + if (cursor != null && cursor.getCount() == 1) { + cursor.moveToFirst(); + return cursor.getString(2); + } else { + title = uri.getLastPathSegment(); + } + } finally { + if (cursor != null) { + cursor.close(); + } } } } -- 2.11.0