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

Commit d0cbb1a5 authored by Dave Sparks's avatar Dave Sparks
Browse files

Check to make sure the Java camera object is still valid on the 

callback from native. Omitted from previous fix. Bug 1936850.
parent 72d19aa5

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) {