diff options
Diffstat (limited to 'core')
| -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() { |