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

Commit 3461ca6b authored by cretin45's avatar cretin45
Browse files

camera: allow proper preview window updates to be disabled 

This causes issues with various video chat apps for devices such as
Sensation and possibly others using HTC MSM8660 camera HAL.

This is needed in Jellybean too.
See: https://github.com/CyanogenMod/android_frameworks_base/commit/795b92632696bcb307332ce32d682664b8c21d94

Change-Id: Ib4ae37df214b774e521b5bfad55f9b4558da148f
parent 3ba8a0c1

services/camera/libcameraservice/CameraHardwareInterface.h

+2 −0
Original line number Diff line number Diff line
@@ -117,10 +117,12 @@ public: 


        if (mDevice->ops->set_preview_window) {

#ifdef QCOM_HARDWARE

#ifndef NO_UPDATE_PREVIEW

            ALOGV("%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

#endif

            mPreviewWindow = buf;

            mHalPreviewWindow.user = this;

services/camera/libcameraservice/CameraService.cpp

+4 −0
Original line number Diff line number Diff line
@@ -553,7 +553,9 @@ void CameraService::Client::disconnect() { 
    // Release the held ANativeWindow resources.

    if (mPreviewWindow != 0) {

#ifdef QCOM_HARDWARE

#ifndef NO_UPDATE_PREVIEW

        mHardware->setPreviewWindow(0);

#endif

#endif

        disconnectWindow(mPreviewWindow);

        mPreviewWindow = 0;
@@ -601,8 +603,10 @@ status_t CameraService::Client::setPreviewWindow(const sp<IBinder>& binder, 
            result = mHardware->setPreviewWindow(window);

        }

#ifdef QCOM_HARDWARE

#ifndef NO_UPDATE_PREVIEW

    } else {

        result = mHardware->setPreviewWindow(window);

#endif

#endif

    }