diff options
| author | Sundar Raman <sunds@ti.com> | 2011-08-25 17:21:34 -0700 |
|---|---|---|
| committer | Iliyan Malchev <malchev@google.com> | 2011-08-26 12:39:42 -0700 |
| commit | 816f63fd6a78b45e18819d9967d409c212c88eae (patch) | |
| tree | 630575477dcb1a6da0012c500264a270abaad694 /camera/inc/CameraHal.h | |
| parent | f8a689d36a1b20942e39d848712e99d4a000fa72 (diff) | |
| download | hardware_ti_omap4xxx-816f63fd6a78b45e18819d9967d409c212c88eae.zip hardware_ti_omap4xxx-816f63fd6a78b45e18819d9967d409c212c88eae.tar.gz hardware_ti_omap4xxx-816f63fd6a78b45e18819d9967d409c212c88eae.tar.bz2 | |
Camera HAL: Do not call cancelBuffer when destroying the display adapter
When a NULL window is passed in setPreviewDisplay, we try to do cancelBuffer
to return the buffers to the ANativeWindow if there is a valid reference
to DisplayAdapter. However, the CameraService already sets the ANativeWindow
reference to NULL before calling setPreviewWindow method of the Camera HAL
so the cancel_buffer crashes. So, we do not call cancel_buffer as the
preview window is destroyed anyway by Camera Service.
Change-Id: Ie07f5fd3ca5bb5a31cb25a174ee1acc2988628af
Signed-off-by: Sundar Raman <sunds@ti.com>
Diffstat (limited to 'camera/inc/CameraHal.h')
| -rw-r--r-- | camera/inc/CameraHal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/camera/inc/CameraHal.h b/camera/inc/CameraHal.h index 2d2661d..0a3f92a 100644 --- a/camera/inc/CameraHal.h +++ b/camera/inc/CameraHal.h @@ -778,7 +778,7 @@ public: virtual int setFrameProvider(FrameNotifier *frameProvider) = 0; virtual int setErrorHandler(ErrorNotifier *errorNotifier) = 0; virtual int enableDisplay(int width, int height, struct timeval *refTime = NULL, S3DParameters *s3dParams = NULL) = 0; - virtual int disableDisplay() = 0; + virtual int disableDisplay(bool cancel_buffer = true) = 0; //Used for Snapshot review temp. pause virtual int pauseDisplay(bool pause) = 0; |