diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2013-06-13 10:43:49 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-06-13 10:43:49 -0700 |
| commit | 04411d3ed343added179703837c6c24444acce3b (patch) | |
| tree | 35ee8d5a224ee9ffff2e69238666535beb254aa7 /services | |
| parent | 2b5f8f451d5459b17a7a99637f99a950fd74cc96 (diff) | |
| parent | ccc366a90fdd8d9df5de27820f04bc534d122c07 (diff) | |
| download | frameworks_av-04411d3ed343added179703837c6c24444acce3b.zip frameworks_av-04411d3ed343added179703837c6c24444acce3b.tar.gz frameworks_av-04411d3ed343added179703837c6c24444acce3b.tar.bz2 | |
am ccc366a9: am 1191454a: Merge "Camera3: Skipping no-ops good, not updating state machine bad." into jb-mr2-dev
* commit 'ccc366a90fdd8d9df5de27820f04bc534d122c07':
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 58d98ef..da18c70 100644 --- a/services/camera/libcameraservice/Camera3Device.cpp +++ b/services/camera/libcameraservice/Camera3Device.cpp @@ -1019,6 +1019,7 @@ status_t Camera3Device::configureStreamsLocked() { if (!mNeedConfig) { ALOGV("%s: Skipping config, no stream changes", __FUNCTION__); + mStatus = STATUS_ACTIVE; return OK; } |