Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ringtone uri should add type query

Browse Source 
When only DisplayName is used to query the default ringtone,
the query may be incorrect, because other types of ringtones
may contain resources with the same name.

It should not happen that other types of ringtone uri are set
as the default ringtone of the current type by mistake.

Bug: 168431815

Change-Id: Ic37f879a658379179dc53715fa016631bb7309d9
This commit is contained in:
wan.li
2020-08-06 14:32:27 +08:00
committed by bing liang
parent fc6fbde5df
commit 3b25df9ad3
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
media/java/android/media/RingtoneManager.java
View File

@@ -1129,12 +1129,14 @@ 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 },
MediaColumns.DISPLAY_NAME + "=?",
new String[] { filename }, null)) {
where,
new String[] { filename , "1"}, null)) {
if (cursor.moveToFirst()) {
final Uri ringtoneUri = context.getContentResolver().canonicalizeOrElse(
ContentUris.withAppendedId(baseUri, cursor.getLong(0)));
@@ -1162,4 +1164,13 @@ 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();
}
}
}