summaryrefslogtreecommitdiffstats
path: root/core/jni
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-09-24 19:59:08 -0400
committerAndroid (Google) Code Review <android-gerrit@google.com>2009-09-24 19:59:08 -0400
commit0665ae22aa51183d6ff5fdd0abeee0344306e89d (patch)
tree76a59129c58764431ab69fa2bef692eb02f2f209 /core/jni
parent0808c961264cd4a9961ac4cb167208d7b1d14dbb (diff)
parent6157de0e2d87568d6d5071b11aeb033a7986b279 (diff)
downloadframeworks_base-0665ae22aa51183d6ff5fdd0abeee0344306e89d.zip
frameworks_base-0665ae22aa51183d6ff5fdd0abeee0344306e89d.tar.gz
frameworks_base-0665ae22aa51183d6ff5fdd0abeee0344306e89d.tar.bz2
Merge change 26939 into eclair
* changes: Fix 2101425: Camera crashes spontaneously in preview.
Diffstat (limited to 'core/jni')
-rw-r--r--core/jni/android_hardware_Camera.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/jni/android_hardware_Camera.cpp b/core/jni/android_hardware_Camera.cpp
index 6b92994..e944654 100644
--- a/core/jni/android_hardware_Camera.cpp
+++ b/core/jni/android_hardware_Camera.cpp
@@ -112,7 +112,7 @@ void JNICameraContext::notify(int32_t msgType, int32_t ext1, int32_t ext2)
}
JNIEnv *env = AndroidRuntime::getJNIEnv();
env->CallStaticVoidMethod(mCameraJClass, fields.post_event,
- mCameraJObjectWeak, msgType, ext1, ext2);
+ mCameraJObjectWeak, msgType, ext1, ext2, NULL);
}
void JNICameraContext::copyAndPost(JNIEnv* env, const sp<IMemory>& dataPtr, int msgType)