diff options
author | Eino-Ville Talvala <etalvala@google.com> | 2014-04-21 20:32:03 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-21 20:32:03 +0000 |
commit | 106b83d2447d3209d12fdc05215b965e05c5efea (patch) | |
tree | 43f2f058db5e09082565ab4fe401886d0349224c /services/camera/libcameraservice/device3 | |
parent | 18e846c1ca29d7c4e4607243bc5ba694385128a1 (diff) | |
parent | dae621c2c7f40f1587b97636975908e1374ade9a (diff) | |
download | frameworks_av-106b83d2447d3209d12fdc05215b965e05c5efea.zip frameworks_av-106b83d2447d3209d12fdc05215b965e05c5efea.tar.gz frameworks_av-106b83d2447d3209d12fdc05215b965e05c5efea.tar.bz2 |
am dae621c2: am 95006625: Merge "camera: set mNeedConfig after creating ZSL stream"
* commit 'dae621c2c7f40f1587b97636975908e1374ade9a':
camera: set mNeedConfig after creating ZSL stream
Diffstat (limited to 'services/camera/libcameraservice/device3')
-rw-r--r-- | services/camera/libcameraservice/device3/Camera3Device.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/services/camera/libcameraservice/device3/Camera3Device.cpp b/services/camera/libcameraservice/device3/Camera3Device.cpp index f965136..31dc103 100644 --- a/services/camera/libcameraservice/device3/Camera3Device.cpp +++ b/services/camera/libcameraservice/device3/Camera3Device.cpp @@ -681,6 +681,8 @@ status_t Camera3Device::createZslStream( } mInputStream = newStream; + mNeedConfig = true; + *id = mNextStreamId++; *zslStream = newStream; |