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

src/com/android/settings/SoundSettings.java

@@ -351,9 +351,12 @@ public class SoundSettings extends SettingsPreferenceFragment implements
             try {
                 Cursor cursor = context.getContentResolver().query(ringtoneUri,
                         new String[] { MediaStore.Audio.Media.TITLE }, null, null, null);
+                if (cursor != null) {
                     if (cursor.moveToFirst()) {
                         summary = cursor.getString(0);
                     }
+                    cursor.close();
+                }
             } catch (SQLiteException sqle) {
                 // Unknown title for the ringtone
             }