am 591ab090: am 3ba2bfa7: Merge "Expand ringtone titles to support OGG and FLAC." into mnc-dev (b1e54abd) · Commits · e / os / android_frameworks_base

media/java/android/media/Ringtone.java

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -52,7 +52,8 @@ public class Ringtone {
	MediaStore.Audio.Media.TITLE		MediaStore.Audio.Media.TITLE
	};		};
	/** Selection that limits query results to just audio files */		/** Selection that limits query results to just audio files */
	private static final String MEDIA_SELECTION = MediaColumns.MIME_TYPE + " LIKE 'audio/%'";		private static final String MEDIA_SELECTION = MediaColumns.MIME_TYPE + " LIKE 'audio/%' OR "
			+ MediaColumns.MIME_TYPE + " IN ('application/ogg', 'application/x-flac')";

	// keep references on active Ringtones until stopped or completion listener called.		// keep references on active Ringtones until stopped or completion listener called.
	private static final ArrayList<Ringtone> sActiveRingtones = new ArrayList<Ringtone>();		private static final ArrayList<Ringtone> sActiveRingtones = new ArrayList<Ringtone>();