diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2013-06-13 10:34:07 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-06-13 10:34:07 -0700 |
| commit | ccc366a90fdd8d9df5de27820f04bc534d122c07 (patch) | |
| tree | db399628ac93166975fd8598e80ff84cd653300d /services | |
| parent | 4541531a6e64329764ad7359775689a8f5aca165 (diff) | |
| parent | 1191454a3a960a1972b0f36e625796c6c1b2c9ca (diff) | |
| download | frameworks_av-ccc366a90fdd8d9df5de27820f04bc534d122c07.zip frameworks_av-ccc366a90fdd8d9df5de27820f04bc534d122c07.tar.gz frameworks_av-ccc366a90fdd8d9df5de27820f04bc534d122c07.tar.bz2 | |
am 1191454a: Merge "Camera3: Skipping no-ops good, not updating state machine bad." into jb-mr2-dev
* commit '1191454a3a960a1972b0f36e625796c6c1b2c9ca':
Camera3: Skipping no-ops good, not updating state machine bad.
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; } |