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

Commit d0cc49f9 authored by Yin-Chia Yeh's avatar Yin-Chia Yeh Committed by android-build-merger
Browse files

Merge "Camera: fix use after freed error" 

am: b7939bbf

Change-Id: Ic2d8d779fbf8246e7e75f1c42fd63555681815fb
parents 23ac59ad b7939bbf

camera/ndk/impl/ACameraDevice.cpp

+0 −1
Original line number Diff line number Diff line
@@ -941,7 +941,6 @@ void CameraDevice::CallbackHandler::onMessageReceived( 
                    ACaptureRequest* request = allocateACaptureRequest(requestSp);

                    (*onFail)(context, session.get(), request, failure);

                    freeACaptureRequest(request);

                    delete failure;

                    break;

                }

                case kWhatCaptureSeqEnd:

camera/ndk/impl/ACameraDevice.h

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 


namespace android {



// Wrap ACameraCaptureFailure so it can be ref-counter

// Wrap ACameraCaptureFailure so it can be ref-counted

struct CameraCaptureFailure : public RefBase, public ACameraCaptureFailure {};



class CameraDevice final : public RefBase {