Merge "NEW_API: Unhide android.hardware.Camera#enableShutterSound" into jb-mr1-dev

This commit is contained in:
Eino-Ville Talvala
2012-09-13 11:15:15 -07:00
committed by Android (Google) Code Review
2 changed files with 1 additions and 1 deletions

View File

@@ -9675,6 +9675,7 @@ package android.hardware {
method public final void addCallbackBuffer(byte[]);
method public final void autoFocus(android.hardware.Camera.AutoFocusCallback);
method public final void cancelAutoFocus();
method public final boolean enableShutterSound(boolean);
method public static void getCameraInfo(int, android.hardware.Camera.CameraInfo);
method public static int getNumberOfCameras();
method public android.hardware.Camera.Parameters getParameters();

View File

@@ -1166,7 +1166,6 @@ public class Camera {
* system shutter sound will play when a picture is taken.
* @see #takePicture
* @see ShutterCallback
* @hide
*/
public native final boolean enableShutterSound(boolean enabled);