summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/Camera.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/android/camera/Camera.java')
-rw-r--r--src/com/android/camera/Camera.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java
index a391e20..8c74d24 100644
--- a/src/com/android/camera/Camera.java
+++ b/src/com/android/camera/Camera.java
@@ -43,9 +43,9 @@ import android.hardware.Camera.FaceDetectionListener;
import android.hardware.Camera.Parameters;
import android.hardware.Camera.PictureCallback;
import android.hardware.Camera.Size;
-import android.hardware.CameraSound;
import android.location.Location;
import android.media.CameraProfile;
+import android.media.MediaActionSound;
import android.net.Uri;
import android.os.Bundle;
import android.os.Handler;
@@ -184,7 +184,7 @@ public class Camera extends ActivityBase implements FocusManager.Listener,
// generating thumbnails. This reduces the shot-to-shot time.
private ImageSaver mImageSaver;
- private CameraSound mCameraSound;
+ private MediaActionSound mCameraSound;
private Runnable mDoSnapRunnable = new Runnable() {
public void run() {
@@ -1066,7 +1066,7 @@ public class Camera extends ActivityBase implements FocusManager.Listener,
@Override
public void playSound(int soundId) {
- mCameraSound.playSound(soundId);
+ mCameraSound.play(soundId);
}
private boolean saveDataToFile(String filePath, byte[] data) {
@@ -1204,7 +1204,7 @@ public class Camera extends ActivityBase implements FocusManager.Listener,
// Do this after starting preview because it depends on camera
// parameters.
initializeIndicatorControl();
- mCameraSound = new CameraSound();
+ mCameraSound = new MediaActionSound();
// Make sure preview is started.
try {