commit 040ad494c5560e83ab8c0414b303aa3f1e1f34bf
author Amith Yamasani <yamasani@google.com> Tue Oct 04 15:28:06 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 04 15:28:06 2011 -0700
tree 6ad6a86c631edcdd1db3b6894b66f88b7df3befc
parent dfb894c1361545a574dc45bcd956c7830238553c
parent c86755bfd56ff620e740e7a99303b54350ebf164

Merge "Handle unexpected null cursor and don't forget to close it."

src/com/android/settings/SoundSettings.java

diff --git a/src/com/android/settings/SoundSettings.java b/src/com/android/settings/SoundSettings.java
index 8b7cd37..f73460b 100644
--- a/src/com/android/settings/SoundSettings.java
+++ b/src/com/android/settings/SoundSettings.java
@@ -351,8 +351,11 @@
             try {
                 Cursor cursor = context.getContentResolver().query(ringtoneUri,
                         new String[] { MediaStore.Audio.Media.TITLE }, null, null, null);
-                if (cursor.moveToFirst()) {
-                    summary = cursor.getString(0);
+                if (cursor != null) {
+                    if (cursor.moveToFirst()) {
+                        summary = cursor.getString(0);
+                    }
+                    cursor.close();
                 }
             } catch (SQLiteException sqle) {
                 // Unknown title for the ringtone