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

Commit 490e2062 authored by Andrew Chant's avatar Andrew Chant Committed by android-build-merger
Browse files

Merge "libcamera2ndk_vendor: stop looper thread on ~ACameraDevice()" into qt-r1-dev 

am: 1c388a30

Change-Id: I7e791a41c5698d01855220586cb13cdbd365d98b
parents c75b5ccf 1c388a30

camera/ndk/ndk_vendor/impl/ACameraDevice.cpp

+10 −0
Original line number Diff line number Diff line
@@ -44,6 +44,16 @@ 


using namespace android;



ACameraDevice::~ACameraDevice() {

    Mutex::Autolock _l(mDevice->mDeviceLock);

    if (mDevice->mCbLooper != nullptr) {

      mDevice->mCbLooper->unregisterHandler(mDevice->mHandler->id());

      mDevice->mCbLooper->stop();

    }

    mDevice->mCbLooper.clear();

    mDevice->mHandler.clear();

}



namespace android {

namespace acam {

camera/ndk/ndk_vendor/impl/ACameraDevice.h

+2 −2
Original line number Diff line number Diff line
@@ -135,6 +135,7 @@ class CameraDevice final : public RefBase { 


  private:

    friend ACameraCaptureSession;

    friend ACameraDevice;



    camera_status_t checkCameraClosedOrErrorLocked() const;
@@ -383,8 +384,7 @@ struct ACameraDevice { 
                  sp<ACameraMetadata> chars) :

            mDevice(new android::acam::CameraDevice(id, cb, std::move(chars), this)) {}



    ~ACameraDevice() {};



    ~ACameraDevice();

    /*******************

     * NDK public APIs *

     *******************/