diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2013-06-13 17:33:20 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-06-13 17:33:20 +0000 |
| commit | 1191454a3a960a1972b0f36e625796c6c1b2c9ca (patch) | |
| tree | b0a2c6fb33299aaa7b4e261ac1af2737cbb186a9 /services | |
| parent | c4a8d2ddfff6d91e493692251733f20ece3e713d (diff) | |
| parent | 31fdb29c9f5569fff20756ef1240120817993660 (diff) | |
| download | frameworks_av-1191454a3a960a1972b0f36e625796c6c1b2c9ca.zip frameworks_av-1191454a3a960a1972b0f36e625796c6c1b2c9ca.tar.gz frameworks_av-1191454a3a960a1972b0f36e625796c6c1b2c9ca.tar.bz2 | |
Merge "Camera3: Skipping no-ops good, not updating state machine bad." into jb-mr2-dev
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; } |