diff options
| author | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2012-07-12 23:46:11 +0100 |
|---|---|---|
| committer | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2012-11-19 23:15:17 +0000 |
| commit | 8415ee214d09ed7f399d8ff68d4f78c76c68fe08 (patch) | |
| tree | 244eefc8d37ca83e77ad6dcf8a2b030805d13001 | |
| parent | dc55ecdab2dba77581c24cf8c6f2652817d99b4f (diff) | |
| download | frameworks_base-8415ee214d09ed7f399d8ff68d4f78c76c68fe08.zip frameworks_base-8415ee214d09ed7f399d8ff68d4f78c76c68fe08.tar.gz frameworks_base-8415ee214d09ed7f399d8ff68d4f78c76c68fe08.tar.bz2 | |
Add support for ICS camera blobs
Change-Id: Icf9010f4b6059405275107fadd5aac81cd294182
| -rw-r--r-- | core/jni/android_hardware_Camera.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/jni/android_hardware_Camera.cpp b/core/jni/android_hardware_Camera.cpp index 67d831c..d8fc55e 100644 --- a/core/jni/android_hardware_Camera.cpp +++ b/core/jni/android_hardware_Camera.cpp @@ -840,12 +840,16 @@ static void android_hardware_Camera_stopFaceDetection(JNIEnv *env, jobject thiz) static void android_hardware_Camera_enableFocusMoveCallback(JNIEnv *env, jobject thiz, jint enable) { ALOGV("enableFocusMoveCallback"); +#ifdef ICS_CAMERA_BLOB + return; +#else sp<Camera> camera = get_native_camera(env, thiz, NULL); if (camera == 0) return; if (camera->sendCommand(CAMERA_CMD_ENABLE_FOCUS_MOVE_MSG, enable, 0) != NO_ERROR) { jniThrowRuntimeException(env, "enable focus move callback failed"); } +#endif } //------------------------------------------------- |