Merge change I6b51a98a into eclair-mr2

* changes: Fixed issue #4098: Ringtone#getTitle does not close its cursor.
2009-10-06 19:32:25 -04:00
parent 13ed5750ba 6b51a98acb
commit 1b7ad876f1
1 changed files with 11 additions and 5 deletions
--- 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();
+                    }
                }
            }
        }