diff options
| author | 2024-08-20 23:19:35 +0000 | |
|---|---|---|
| committer | 2024-08-20 23:19:35 +0000 | |
| commit | 2adbfb4d1adab20baea0af6fc17b33fbc80de15a (patch) | |
| tree | aefe29215de611b7100f7afee507bff355570376 | |
| parent | 72e5e7e59eaf491715653ec840712fcfdd725b6b (diff) | |
| parent | 8ca5dd90bf93f5008c2436ef8a59fdcfa7c9b4a9 (diff) | |
Merge "RingtoneManager: allow video ringtone URI" into sc-dev am: 5153b26bf9 am: 2ea5500310 am: 07a72155ec am: 682944b45f am: dda07ea9e4 am: 8ca5dd90bf
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/28021006
Change-Id: Ia3254497cf2285f9836439fe0f229467200c094e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -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 d2b21ae19162..cce4418fcafc 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 cc5d6f7d0ae5..08c4219fea13 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java @@ -1948,7 +1948,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( @@ -1983,7 +1983,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( @@ -2001,10 +2001,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; } } |