diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2012-09-21 16:05:58 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-21 16:05:59 -0700 |
| commit | 5ce25d717059c9c37618aa349314077f99ac34c7 (patch) | |
| tree | 56f89a5a26050d77ef2ccd68251b1303d8791254 /core/java/android | |
| parent | ec501466ea78758de4e0ab8057713c697829c2ec (diff) | |
| parent | f7c6c5ad64c8e5d20e1806cc98b9919334c69614 (diff) | |
| download | frameworks_base-5ce25d717059c9c37618aa349314077f99ac34c7.zip frameworks_base-5ce25d717059c9c37618aa349314077f99ac34c7.tar.gz frameworks_base-5ce25d717059c9c37618aa349314077f99ac34c7.tar.bz2 | |
Merge "NEW_API: Add android.hardware.Camera.CameraInfo#canDisableShutterSound" into jb-mr1-dev
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/hardware/Camera.java | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/core/java/android/hardware/Camera.java b/core/java/android/hardware/Camera.java index 7b3a8af..375d788 100644 --- a/core/java/android/hardware/Camera.java +++ b/core/java/android/hardware/Camera.java @@ -233,6 +233,21 @@ public class Camera { * @see Parameters#setJpegThumbnailSize(int, int) */ public int orientation; + + /** + * <p>Whether the shutter sound can be disabled.</p> + * + * <p>On some devices, the camera shutter sound cannot be turned off + * through {@link #enableShutterSound enableShutterSound}. This field + * can be used to determine whether a call to disable the shutter sound + * will succeed.</p> + * + * <p>If this field is set to true, then a call of + * {@code enableShutterSound(false)} will be successful. If set to + * false, then that call will fail, and the shutter sound will be played + * when {@link Camera#takePicture takePicture} is called.</p> + */ + public boolean canDisableShutterSound; }; /** |