diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2012-10-08 18:16:35 -0700 |
|---|---|---|
| committer | Eino-Ville Talvala <etalvala@google.com> | 2012-10-08 23:53:48 -0700 |
| commit | 4f8e5ce21df881796d05a1b2117dd8868570a57b (patch) | |
| tree | c65eee3681d1bf42f5943cff08719206b42fa6cd /core/jni/android_hardware_Camera.cpp | |
| parent | e70bf65423056c2f336602aa9b3942ea446225e4 (diff) | |
| download | frameworks_base-4f8e5ce21df881796d05a1b2117dd8868570a57b.zip frameworks_base-4f8e5ce21df881796d05a1b2117dd8868570a57b.tar.gz frameworks_base-4f8e5ce21df881796d05a1b2117dd8868570a57b.tar.bz2 | |
Camera: Query AudioService for shutter sound enforcement.
The AudioService now tracks the shutter sound enforcement status, in
addition to the existing approach. Check with it when doing shutter
sound operations.
Bug: 7032634
Change-Id: Ief855d3a36ca5679832cf439f5638b10f70b8636
Diffstat (limited to 'core/jni/android_hardware_Camera.cpp')
| -rw-r--r-- | core/jni/android_hardware_Camera.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/jni/android_hardware_Camera.cpp b/core/jni/android_hardware_Camera.cpp index 99d49ec..67d831c 100644 --- a/core/jni/android_hardware_Camera.cpp +++ b/core/jni/android_hardware_Camera.cpp @@ -854,7 +854,7 @@ static JNINativeMethod camMethods[] = { { "getNumberOfCameras", "()I", (void *)android_hardware_Camera_getNumberOfCameras }, - { "getCameraInfo", + { "_getCameraInfo", "(ILandroid/hardware/Camera$CameraInfo;)V", (void*)android_hardware_Camera_getCameraInfo }, { "native_setup", @@ -917,7 +917,7 @@ static JNINativeMethod camMethods[] = { { "setDisplayOrientation", "(I)V", (void *)android_hardware_Camera_setDisplayOrientation }, - { "enableShutterSound", + { "_enableShutterSound", "(Z)Z", (void *)android_hardware_Camera_enableShutterSound }, { "_startFaceDetection", |