From d0cbb1a52d1b2b8b04a122501d696938b295e502 Mon Sep 17 00:00:00 2001
From: Dave Sparks <davidsparks@android.com>
Date: Mon, 29 Jun 2009 19:03:33 -0700
Subject: Check to make sure the Java camera object is still valid on the
 callback from native. Omitted from previous fix. Bug 1936850.

---
 core/jni/android_hardware_Camera.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core/jni/android_hardware_Camera.cpp b/core/jni/android_hardware_Camera.cpp
index 3550716..3dcc09f 100644
--- a/core/jni/android_hardware_Camera.cpp
+++ b/core/jni/android_hardware_Camera.cpp
@@ -171,6 +171,10 @@ void JNICameraContext::postData(int32_t msgType, const sp<IMemory>& dataPtr)
     // VM pointer will be NULL if object is released
     Mutex::Autolock _l(mLock);
     JNIEnv *env = AndroidRuntime::getJNIEnv();
+    if (mCameraJObjectWeak == NULL) {
+        LOGW("callback on dead camera object");
+        return;
+    }
 
     // return data based on callback type
     switch(msgType) {
-- 
cgit v1.1