Merge "Revert "Ringtone uri should add type query"" (56da2781) · Commits · e / os / android_frameworks_base

media/java/android/media/RingtoneManager.java

+2 −13

Original line number	Diff line number	Diff line
		@@ -1129,14 +1129,12 @@ public class RingtoneManager {
		}

		// Try finding the scanned ringtone
		final String whichAudio = getQueryStringForType(type);
		final String filename = getDefaultRingtoneFilename(type);
		final String where = MediaColumns.DISPLAY_NAME + "=?," + whichAudio + "=?";
		final Uri baseUri = MediaStore.Audio.Media.INTERNAL_CONTENT_URI;
		try (Cursor cursor = context.getContentResolver().query(baseUri,
		new String[] { MediaColumns._ID },
		where,
		new String[] { filename , "1"}, null)) {
		MediaColumns.DISPLAY_NAME + "=?",
		new String[] { filename }, null)) {
		if (cursor.moveToFirst()) {
		final Uri ringtoneUri = context.getContentResolver().canonicalizeOrElse(
		ContentUris.withAppendedId(baseUri, cursor.getLong(0)));
		@@ -1164,13 +1162,4 @@ public class RingtoneManager {
		default: throw new IllegalArgumentException();
		}
		}

		private static String getQueryStringForType(int type) {
		switch (type) {
		case TYPE_RINGTONE: return MediaStore.Audio.AudioColumns.IS_RINGTONE;
		case TYPE_NOTIFICATION: return MediaStore.Audio.AudioColumns.IS_NOTIFICATION;
		case TYPE_ALARM: return MediaStore.Audio.AudioColumns.IS_ALARM;
		default: throw new IllegalArgumentException();
		}
		}
		}