diff options
| author | 2014-05-01 10:16:24 -0700 | |
|---|---|---|
| committer | 2014-05-01 14:36:44 -0700 | |
| commit | 559c76dbc37ff25b204ed1f060d3ec2fa43d718c (patch) | |
| tree | ca77f3f032fe1bb044e2a8c00e44f30dfd6b397b | |
| parent | 4a26164316b0d9a6d97dfbb85a2ac176384bb985 (diff) | |
Bounds Check in onPlaySoundEffect
Prevents system crash
Bug: 13514877
Change-Id: Id03561779611d9eb7402ff206fd877b39bb2f035
| -rw-r--r-- | media/java/android/media/AudioService.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/media/java/android/media/AudioService.java b/media/java/android/media/AudioService.java index 4513ead0ced2..0c8a823d8792 100644 --- a/media/java/android/media/AudioService.java +++ b/media/java/android/media/AudioService.java @@ -1787,6 +1787,11 @@ public class AudioService extends IAudioService.Stub { /** @see AudioManager#playSoundEffect(int, float) */ public void playSoundEffectVolume(int effectType, float volume) { + if (effectType >= AudioManager.NUM_SOUND_EFFECTS || effectType < 0) { + Log.w(TAG, "AudioService effectType value " + effectType + " out of range"); + return; + } + sendMsg(mAudioHandler, MSG_PLAY_SOUND_EFFECT, SENDMSG_QUEUE, effectType, (int) (volume * 1000), null, 0); } |