diff options
| author | Zhijun He <zhijunhe@google.com> | 2013-09-16 18:23:35 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-16 18:23:35 +0000 |
| commit | 72a2f171ddf5c1eab7d6ccd47ac2b7ac4fc9c087 (patch) | |
| tree | 3b2e12db021c40434ed1d6a6b1b8e145b7576ceb | |
| parent | a5652e9cdaf6624e03a7e84c40590a42e44c5217 (diff) | |
| parent | 527748abf04c0060894fd7aace54959a2c343435 (diff) | |
| download | frameworks_av-72a2f171ddf5c1eab7d6ccd47ac2b7ac4fc9c087.zip frameworks_av-72a2f171ddf5c1eab7d6ccd47ac2b7ac4fc9c087.tar.gz frameworks_av-72a2f171ddf5c1eab7d6ccd47ac2b7ac4fc9c087.tar.bz2 | |
Merge "Camera: setCallBackWindow only if callback surface is used" into klp-dev
| -rw-r--r-- | services/camera/libcameraservice/api1/Camera2Client.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/camera/libcameraservice/api1/Camera2Client.cpp b/services/camera/libcameraservice/api1/Camera2Client.cpp index bda2887..e7f6c53 100644 --- a/services/camera/libcameraservice/api1/Camera2Client.cpp +++ b/services/camera/libcameraservice/api1/Camera2Client.cpp @@ -604,7 +604,7 @@ void Camera2Client::setPreviewCallbackFlagL(Parameters ¶ms, int flag) { } if (params.previewCallbackFlags != (uint32_t)flag) { - if (flag != CAMERA_FRAME_CALLBACK_FLAG_NOOP) { + if (params.previewCallbackSurface && flag != CAMERA_FRAME_CALLBACK_FLAG_NOOP) { // Disable any existing preview callback window when enabling // preview callback flags res = mCallbackProcessor->setCallbackWindow(NULL); |