Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b430899 authored by Android (Google) Code Review's avatar Android (Google) Code Review Committed by The Android Open Source Project
Browse files

am b1a97523: Merge change 5739 into donut 

Merge commit 'b1a97523'

* commit 'b1a97523':
  Check to make sure the Java camera object is still valid on the
parents 6a840aac b1a97523

core/jni/android_hardware_Camera.cpp

+4 −0
Original line number Diff line number Diff line
@@ -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) {