summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorEino-Ville Talvala <etalvala@google.com>2012-09-13 11:15:15 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-09-13 11:15:15 -0700
commitf353f948a5867fb43c9ee1dbec1ebc93f91655ec (patch)
tree7403e0bb861dc75d8e3f6e4a2df930b5d172a894 /api
parentf60921d921947d7d40285f471a09b0478044c29c (diff)
parentaf87681f48b26f38008bb04fc473e16b7306bc54 (diff)
downloadframeworks_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 'api')
-rw-r--r--api/current.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index 647a0a9..f6ec045 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -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();