diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2012-01-05 15:34:53 -0800 |
|---|---|---|
| committer | Eino-Ville Talvala <etalvala@google.com> | 2012-01-06 10:24:01 -0800 |
| commit | b7feb1c91f1053adb1815bc522c43db3f2c3f598 (patch) | |
| tree | 7ca9c3301b21b0772ffac64bd0fdfd988ec4e750 /core/java/android/hardware | |
| parent | dacbf67ab915fa8b987f6fb9f044160af92652cd (diff) | |
| download | frameworks_base-b7feb1c91f1053adb1815bc522c43db3f2c3f598.zip frameworks_base-b7feb1c91f1053adb1815bc522c43db3f2c3f598.tar.gz frameworks_base-b7feb1c91f1053adb1815bc522c43db3f2c3f598.tar.bz2 | |
Switch camera sounds to always use the system enforced audio stream.
Instead of picking between the music stream and the enforced audio
stream, change the camera service to always play sounds through
enforced system stream. Also update the currently-hidden CameraSound
API to match.
Bug: 5778365
Change-Id: I3cc64b1d1ff567dbac8020a665d5b19846197ff3
Diffstat (limited to 'core/java/android/hardware')
| -rw-r--r-- | core/java/android/hardware/CameraSound.java | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/core/java/android/hardware/CameraSound.java b/core/java/android/hardware/CameraSound.java index 32de0cd..dc97ff0 100644 --- a/core/java/android/hardware/CameraSound.java +++ b/core/java/android/hardware/CameraSound.java @@ -110,7 +110,6 @@ public class CameraSound { private static class CameraSoundPlayer implements Runnable { private int mSoundId; - private int mAudioStreamType; private MediaPlayer mPlayer; private Thread mThread; private boolean mExit; @@ -147,7 +146,7 @@ public class CameraSound { } mPlayer = new MediaPlayer(); try { - mPlayer.setAudioStreamType(mAudioStreamType); + mPlayer.setAudioStreamType(AudioManager.STREAM_SYSTEM_ENFORCED); mPlayer.setDataSource(soundFilePath); mPlayer.setLooping(false); mPlayer.prepare(); @@ -179,11 +178,6 @@ public class CameraSound { public CameraSoundPlayer(int soundId) { mSoundId = soundId; - if (SystemProperties.get("ro.camera.sound.forced", "0").equals("0")) { - mAudioStreamType = AudioManager.STREAM_MUSIC; - } else { - mAudioStreamType = AudioManager.STREAM_SYSTEM_ENFORCED; - } } public void play() { |