diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2022-12-07 04:36:46 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-08-22 02:11:23 +0000 |
| commit | afdaf7cae37ae1e1abd5cece2e175e914ed495f0 (patch) | |
| tree | 6d5cfee368a5d3810a0982857e234e3378982345 | |
| parent | 673543a3fb4d3149592adf3c5f9e9480bd2e7cdd (diff) | |
| download | base-afdaf7cae37ae1e1abd5cece2e175e914ed495f0.tar.gz | |
RingtoneManager: verify default ringtone is audio
When a ringtone picker tries to set a ringtone through
RingtoneManager.setActualDefaultRingtoneUri (also
called by com.android.settings.DefaultRingtonePreference),
verify the mimeType can be obtained (not found when caller
doesn't have access to it) and it is an audio resource.
Bug: 205837340
Test: atest android.media.audio.cts.RingtoneManagerTest
(cherry picked from commit 38618f9fb16d3b5617e2289354d47abe5af17dad)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:88f5aae54cf522e4ec50c2dbf2c782872734db00)
Merged-In: I3f2c487ded405c0c1a83ef0a2fe99cff7cc9328e
Change-Id: I3f2c487ded405c0c1a83ef0a2fe99cff7cc9328e
| -rw-r--r-- | media/java/android/media/RingtoneManager.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/java/android/media/RingtoneManager.java b/media/java/android/media/RingtoneManager.java index d2b21ae19162..2c18342af94d 100644 --- a/media/java/android/media/RingtoneManager.java +++ b/media/java/android/media/RingtoneManager.java @@ -807,10 +807,10 @@ public class RingtoneManager { return ringtoneUri; } - + /** * Sets the {@link Uri} of the default sound for a given sound type. - * + * * @param context A context used for querying. * @param type The type whose default sound should be set. One of * {@link #TYPE_RINGTONE}, {@link #TYPE_NOTIFICATION}, or |