From 31fdb29c9f5569fff20756ef1240120817993660 Mon Sep 17 00:00:00 2001 From: Eino-Ville Talvala Date: Wed, 12 Jun 2013 17:06:41 -0700 Subject: Camera3: Skipping no-ops good, not updating state machine bad. If a HAL-level stream reconfigure is not needed, still need to transition camera device to ACTIVE state in configureStreams. Otherwise, shutdown functions will not wait for device to drain properly. Bug: 9413025 Change-Id: I0b15792097c7e5771015f2a362735d5f88b8c6ea --- services/camera/libcameraservice/Camera3Device.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'services') diff --git a/services/camera/libcameraservice/Camera3Device.cpp b/services/camera/libcameraservice/Camera3Device.cpp index bc4db91..6ee6901 100644 --- a/services/camera/libcameraservice/Camera3Device.cpp +++ b/services/camera/libcameraservice/Camera3Device.cpp @@ -1012,6 +1012,7 @@ status_t Camera3Device::configureStreamsLocked() { if (!mNeedConfig) { ALOGV("%s: Skipping config, no stream changes", __FUNCTION__); + mStatus = STATUS_ACTIVE; return OK; } -- cgit v1.1