diff options
| author | 2024-06-24 17:29:14 -0700 | |
|---|---|---|
| committer | 2024-08-20 03:38:40 +0000 | |
| commit | a3d258ea3b916cf97bfc00a7637cd8efea48d138 (patch) | |
| tree | e56032fb363c5cfac5dbe92a93ad83561b7498c2 | |
| parent | de5889aa13af0ad7ba10c4449e012172e9e6e051 (diff) | |
RingtoneManager: allow video ringtone URI
When checking the MIME type for the default ringtone, also
allow it to refer to video content.
Bug: 205837340
Test: see POC + atest android.media.audio.cts.RingtoneManagerTest
Merged-In: Iac9f27f14bae29e0fabc31e05da2357f6f4f16c7
Change-Id: Iac9f27f14bae29e0fabc31e05da2357f6f4f16c7
| -rw-r--r-- | media/java/android/media/RingtoneManager.java | 8 | ||||
| -rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java | 11 |
2 files changed, 13 insertions, 6 deletions
diff --git a/media/java/android/media/RingtoneManager.java b/media/java/android/media/RingtoneManager.java index 8aecf7f17026..2dc6365c2e29 100644 --- a/media/java/android/media/RingtoneManager.java +++ b/media/java/android/media/RingtoneManager.java @@ -834,9 +834,13 @@ public class RingtoneManager { + " ignored: failure to find mimeType (no access from this context?)"); return; } - if (!(mimeType.startsWith("audio/") || mimeType.equals("application/ogg"))) { + if (!(mimeType.startsWith("audio/") || mimeType.equals("application/ogg") + || mimeType.equals("application/x-flac") + // also check for video ringtones + || mimeType.startsWith("video/") || mimeType.equals("application/mp4"))) { Log.e(TAG, "setActualDefaultRingtoneUri for URI:" + ringtoneUri - + " ignored: associated mimeType:" + mimeType + " is not an audio type"); + + " ignored: associated MIME type:" + mimeType + + " is not a recognized audio or video type"); return; } } diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java index a1d1f21fd3ec..303e79662de3 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java @@ -1886,7 +1886,7 @@ public class SettingsProvider extends ContentProvider { cacheName = Settings.System.ALARM_ALERT_CACHE; } if (cacheName != null) { - if (!isValidAudioUri(name, value)) { + if (!isValidMediaUri(name, value)) { return false; } final File cacheFile = new File( @@ -1921,7 +1921,7 @@ public class SettingsProvider extends ContentProvider { } } - private boolean isValidAudioUri(String name, String uri) { + private boolean isValidMediaUri(String name, String uri) { if (uri != null) { Uri audioUri = Uri.parse(uri); if (Settings.AUTHORITY.equals( @@ -1939,10 +1939,13 @@ public class SettingsProvider extends ContentProvider { return false; } if (!(mimeType.startsWith("audio/") || mimeType.equals("application/ogg") - || mimeType.equals("application/x-flac"))) { + || mimeType.equals("application/x-flac") + // also check for video ringtones + || mimeType.startsWith("video/") || mimeType.equals("application/mp4"))) { Slog.e(LOG_TAG, "mutateSystemSetting for setting: " + name + " URI: " + audioUri - + " ignored: associated mimeType: " + mimeType + " is not an audio type"); + + " ignored: associated MIME type: " + mimeType + + " is not a recognized audio or video type"); return false; } } |