diff options
| author | Igor Murashkin <iam@google.com> | 2012-10-29 13:38:10 -0700 |
|---|---|---|
| committer | Igor Murashkin <iam@google.com> | 2012-10-30 14:44:25 -0700 |
| commit | c99db2bc460cc795947d99076da380e22a21e493 (patch) | |
| tree | 32780df712b789e7812e50e81b84c4db01ca7223 /core/jni/android_hardware_Camera.cpp | |
| parent | 658da63ffd36c2dbc9020d46d2420ec83c7800d2 (diff) | |
| download | frameworks_base-c99db2bc460cc795947d99076da380e22a21e493.zip frameworks_base-c99db2bc460cc795947d99076da380e22a21e493.tar.gz frameworks_base-c99db2bc460cc795947d99076da380e22a21e493.tar.bz2 | |
Updated android.graphics.SurfaceTexture to use wp for FrameAvailableListener
Bug: 7425644
Change-Id: I7ccdc0ef421df7240d6cff9222c37411b1ecaf01
Diffstat (limited to 'core/jni/android_hardware_Camera.cpp')
| -rw-r--r-- | core/jni/android_hardware_Camera.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/core/jni/android_hardware_Camera.cpp b/core/jni/android_hardware_Camera.cpp index 67d831c..d39f565c 100644 --- a/core/jni/android_hardware_Camera.cpp +++ b/core/jni/android_hardware_Camera.cpp @@ -22,6 +22,7 @@ #include "jni.h" #include "JNIHelp.h" #include "android_runtime/AndroidRuntime.h" +#include <android_runtime/android_graphics_SurfaceTexture.h> #include <cutils/properties.h> #include <utils/Vector.h> @@ -36,7 +37,6 @@ using namespace android; struct fields_t { jfieldID context; jfieldID surface; - jfieldID surfaceTexture; jfieldID facing; jfieldID orientation; jfieldID canDisableShutterSound; @@ -555,8 +555,8 @@ static void android_hardware_Camera_setPreviewTexture(JNIEnv *env, sp<BufferQueue> bufferQueue = NULL; if (jSurfaceTexture != NULL) { - sp<SurfaceTexture> surfaceTexture = reinterpret_cast<SurfaceTexture*>(env->GetIntField( - jSurfaceTexture, fields.surfaceTexture)); + sp<SurfaceTexture> surfaceTexture = + SurfaceTexture_getSurfaceTexture(env, jSurfaceTexture); if (surfaceTexture != NULL) { bufferQueue = surfaceTexture->getBufferQueue(); } @@ -966,8 +966,6 @@ int register_android_hardware_Camera(JNIEnv *env) field fields_to_find[] = { { "android/hardware/Camera", "mNativeContext", "I", &fields.context }, { "android/view/Surface", ANDROID_VIEW_SURFACE_JNI_ID, "I", &fields.surface }, - { "android/graphics/SurfaceTexture", - 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", |