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

Commit 00900eb3 authored by Chih-Chung Chang's avatar Chih-Chung Chang
Browse files

Fix 2083478: Camera needs an auto-focus cancel API 

Change-Id: I13bda991b32aee47e82b5cf9d43b3021c416a9a2
parent f5733b29

camera/libcameraservice/CameraHardwareStub.cpp

+5 −0
Original line number Diff line number Diff line
@@ -265,6 +265,11 @@ status_t CameraHardwareStub::autoFocus() 
    return NO_ERROR;

}



status_t CameraHardwareStub::cancelAutoFocus()

{

    return NO_ERROR;

}



/*static*/ int CameraHardwareStub::beginPictureThread(void *cookie)

{

    CameraHardwareStub *c = (CameraHardwareStub *)cookie;

camera/libcameraservice/CameraHardwareStub.h

+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ public: 
    virtual void        releaseRecordingFrame(const sp<IMemory>& mem);



    virtual status_t    autoFocus();

    virtual status_t    cancelAutoFocus();

    virtual status_t    takePicture();

    virtual status_t    cancelPicture();

    virtual status_t    dump(int fd, const Vector<String16>& args) const;

camera/libcameraservice/CameraService.cpp

+16 −1
Original line number Diff line number Diff line
@@ -798,7 +798,6 @@ static void dump_to_file(const char *fname, 
}

#endif



// take a picture - image is returned in callback

status_t CameraService::Client::autoFocus()

{

    LOGD("autoFocus (pid %d)", getCallingPid());
@@ -815,6 +814,22 @@ status_t CameraService::Client::autoFocus() 
    return mHardware->autoFocus();

}



status_t CameraService::Client::cancelAutoFocus()

{

    LOGD("cancelAutoFocus (pid %d)", getCallingPid());



    Mutex::Autolock lock(mLock);

    status_t result = checkPid();

    if (result != NO_ERROR) return result;



    if (mHardware == 0) {

        LOGE("mHardware is NULL, returning.");

        return INVALID_OPERATION;

    }



    return mHardware->cancelAutoFocus();

}



// take a picture - image is returned in callback

status_t CameraService::Client::takePicture()

{

camera/libcameraservice/CameraService.h

+3 −0
Original line number Diff line number Diff line
@@ -110,6 +110,9 @@ private: 
        // auto focus

        virtual status_t        autoFocus();



        // cancel auto focus

        virtual status_t        cancelAutoFocus();



        // take a picture - returns an IMemory (ref-counted mmap)

        virtual status_t        takePicture();

include/ui/Camera.h

+3 −0
Original line number Diff line number Diff line
@@ -143,6 +143,9 @@ public: 
            // autoFocus - status returned from callback

            status_t    autoFocus();



            // cancel auto focus

            status_t    cancelAutoFocus();



            // take a picture - picture returned from callback

            status_t    takePicture();