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

Commit 954787ae authored by Ricardo Cerqueira's avatar Ricardo Cerqueira Committed by Gerrit Code Review
Browse files

Merge "camera: Add missing QCOM_HARDWARE #ifdefs" into ics

parents 9bacd119 a0e33d0a

services/camera/libcameraservice/CameraHardwareInterface.h

+2 −0
Original line number Diff line number Diff line
@@ -115,10 +115,12 @@ public: 
        LOGV("%s(%s) buf %p", __FUNCTION__, mName.string(), buf.get());



        if (mDevice->ops->set_preview_window) {

#ifdef QCOM_HARDWARE

            LOGV("%s buf %p mPreviewWindow %p", __FUNCTION__, buf.get(), mPreviewWindow.get());

            if (mPreviewWindow.get() && (buf.get() != mPreviewWindow.get())) {

                 mDevice->ops->set_preview_window(mDevice, 0);

            }

#endif



            mPreviewWindow = buf;

            mHalPreviewWindow.user = this;

services/camera/libcameraservice/CameraService.cpp

+4 −0
Original line number Diff line number Diff line
@@ -528,7 +528,9 @@ void CameraService::Client::disconnect() { 


    // Release the held ANativeWindow resources.

    if (mPreviewWindow != 0) {

#ifdef QCOM_HARDWARE

        mHardware->setPreviewWindow(0);

#endif

        disconnectWindow(mPreviewWindow);

        mPreviewWindow = 0;

    }
@@ -570,8 +572,10 @@ status_t CameraService::Client::setPreviewWindow(const sp<IBinder>& binder, 
            native_window_set_buffers_transform(window.get(), mOrientation);

            result = mHardware->setPreviewWindow(window);

        }

#ifdef QCOM_HARDWARE

    } else {

        result = mHardware->setPreviewWindow(window);

#endif

    }



    if (result == NO_ERROR) {