summaryrefslogtreecommitdiffstats
path: root/services/camera
diff options
context:
space:
mode:
authorEino-Ville Talvala <etalvala@google.com>2014-04-21 20:28:59 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-04-21 20:28:59 +0000
commitdae621c2c7f40f1587b97636975908e1374ade9a (patch)
treeb13d0e77d9261bc6b408f5ea6554ba53cd2f19e9 /services/camera
parent474038aef32f47d080567e8519d916b069a4f707 (diff)
parent95006625bd1c562c952833bf08c52e7e6c524363 (diff)
downloadframeworks_av-dae621c2c7f40f1587b97636975908e1374ade9a.zip
frameworks_av-dae621c2c7f40f1587b97636975908e1374ade9a.tar.gz
frameworks_av-dae621c2c7f40f1587b97636975908e1374ade9a.tar.bz2
am 95006625: Merge "camera: set mNeedConfig after creating ZSL stream"
* commit '95006625bd1c562c952833bf08c52e7e6c524363': camera: set mNeedConfig after creating ZSL stream
Diffstat (limited to 'services/camera')
-rw-r--r--services/camera/libcameraservice/device3/Camera3Device.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/services/camera/libcameraservice/device3/Camera3Device.cpp b/services/camera/libcameraservice/device3/Camera3Device.cpp
index 7e11a3b..1d4768c 100644
--- a/services/camera/libcameraservice/device3/Camera3Device.cpp
+++ b/services/camera/libcameraservice/device3/Camera3Device.cpp
@@ -654,6 +654,8 @@ status_t Camera3Device::createZslStream(
}
mInputStream = newStream;
+ mNeedConfig = true;
+
*id = mNextStreamId++;
*zslStream = newStream;