diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2012-09-13 11:15:15 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-13 11:15:15 -0700 |
| commit | f353f948a5867fb43c9ee1dbec1ebc93f91655ec (patch) | |
| tree | 7403e0bb861dc75d8e3f6e4a2df930b5d172a894 /core/java/android/hardware/Camera.java | |
| parent | f60921d921947d7d40285f471a09b0478044c29c (diff) | |
| parent | af87681f48b26f38008bb04fc473e16b7306bc54 (diff) | |
| download | frameworks_base-f353f948a5867fb43c9ee1dbec1ebc93f91655ec.zip frameworks_base-f353f948a5867fb43c9ee1dbec1ebc93f91655ec.tar.gz frameworks_base-f353f948a5867fb43c9ee1dbec1ebc93f91655ec.tar.bz2 | |
Merge "NEW_API: Unhide android.hardware.Camera#enableShutterSound" into jb-mr1-dev
Diffstat (limited to 'core/java/android/hardware/Camera.java')
| -rw-r--r-- | core/java/android/hardware/Camera.java | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/core/java/android/hardware/Camera.java b/core/java/android/hardware/Camera.java index 08e0ebe..bc10e03 100644 --- a/core/java/android/hardware/Camera.java +++ b/core/java/android/hardware/Camera.java @@ -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); |