diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2013-06-12 17:06:41 -0700 |
|---|---|---|
| committer | Eino-Ville Talvala <etalvala@google.com> | 2013-06-12 17:52:05 -0700 |
| commit | 31fdb29c9f5569fff20756ef1240120817993660 (patch) | |
| tree | df780b93b503318a58823d1c19da0f1835dabadf /services | |
| parent | 0662f7b6735df0a140f6512285d05f8f9a38bb98 (diff) | |
| download | frameworks_av-31fdb29c9f5569fff20756ef1240120817993660.zip frameworks_av-31fdb29c9f5569fff20756ef1240120817993660.tar.gz frameworks_av-31fdb29c9f5569fff20756ef1240120817993660.tar.bz2 | |
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
Diffstat (limited to 'services')
| -rw-r--r-- | services/camera/libcameraservice/Camera3Device.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
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; } |