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

Merge "Allow ogg files to be selected as ringtones" into oc-dev

Browse Source
This commit is contained in:
Christine Franks
2017-05-10 15:03:23 +00:00
committed by Android (Google) Code Review
parent 0c34dc60c4 8fbedbbf19
commit d44afb99c8
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -943,7 +943,8 @@ public class RingtoneManager {
// Sanity-check: are we actually being asked to install an audio file? // Sanity-check: are we actually being asked to install an audio file?
final String mimeType = mContext.getContentResolver().getType(fileUri); final String mimeType = mContext.getContentResolver().getType(fileUri);
if(mimeType == null || !mimeType.startsWith("audio/")) { if(mimeType == null ||
!(mimeType.startsWith("audio/") || mimeType.equals("application/ogg"))) {
throw new IllegalArgumentException("Ringtone file must have MIME type \"audio/*\"." throw new IllegalArgumentException("Ringtone file must have MIME type \"audio/*\"."
+ " Given file has MIME type \"" + mimeType + "\""); + " Given file has MIME type \"" + mimeType + "\"");
} }