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/jni | |
| 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/jni')
| -rw-r--r-- | core/jni/android_hardware_Camera.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/core/jni/android_hardware_Camera.cpp b/core/jni/android_hardware_Camera.cpp index e1e97a1..99d49ec 100644 --- a/core/jni/android_hardware_Camera.cpp +++ b/core/jni/android_hardware_Camera.cpp @@ -23,6 +23,7 @@ #include "JNIHelp.h" #include "android_runtime/AndroidRuntime.h" +#include <cutils/properties.h> #include <utils/Vector.h> #include <gui/SurfaceTexture.h> @@ -38,6 +39,7 @@ struct fields_t { jfieldID surfaceTexture; jfieldID facing; jfieldID orientation; + jfieldID canDisableShutterSound; jfieldID face_rect; jfieldID face_score; jfieldID rect_left; @@ -453,6 +455,12 @@ static void android_hardware_Camera_getCameraInfo(JNIEnv *env, jobject thiz, } env->SetIntField(info_obj, fields.facing, cameraInfo.facing); env->SetIntField(info_obj, fields.orientation, cameraInfo.orientation); + + char value[PROPERTY_VALUE_MAX]; + property_get("ro.camera.sound.forced", value, "0"); + jboolean canDisableShutterSound = (strncmp(value, "0", 2) == 0); + env->SetBooleanField(info_obj, fields.canDisableShutterSound, + canDisableShutterSound); } // connect to camera service @@ -962,6 +970,8 @@ int register_android_hardware_Camera(JNIEnv *env) ANDROID_GRAPHICS_SURFACETEXTURE_JNI_ID, "I", &fields.surfaceTexture }, { "android/hardware/Camera$CameraInfo", "facing", "I", &fields.facing }, { "android/hardware/Camera$CameraInfo", "orientation", "I", &fields.orientation }, + { "android/hardware/Camera$CameraInfo", "canDisableShutterSound", "Z", + &fields.canDisableShutterSound }, { "android/hardware/Camera$Face", "rect", "Landroid/graphics/Rect;", &fields.face_rect }, { "android/hardware/Camera$Face", "score", "I", &fields.face_score }, { "android/graphics/Rect", "left", "I", &fields.rect_left }, |