Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'f353f948a5867fb43c9ee1dbec1ebc93f91655ec':
  NEW_API: Unhide android.hardware.Camera#enableShutterSound
This commit is contained in:
Eino-Ville Talvala
2012-09-13 11:17:59 -07:00
committed by Android Git Automerger
parent d3f8c776fe f353f948a5
commit e80406979f
2 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

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

1
core/java/android/hardware/Camera.java
View File

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