commit | 5a269fa72b419e7fe4bf6bf9b27eec8782b3a963 | [log] [tgz] |
---|---|---|
author | Igor Murashkin <iam@google.com> | Mon Apr 15 14:59:22 2013 -0700 |
committer | Igor Murashkin <iam@google.com> | Fri Apr 26 11:13:43 2013 -0700 |
tree | 74ba220ec1c528a724112152406d8b6a590f3661 | |
parent | 02f8457cf788e09e4f0c302dda453f13293009e7 [diff] [blame] |
Camera3: Add input stream support - Untested with actual CAMERA3_STREAM_INPUT streams. Bug: 8629088 Change-Id: Ia0c21ef0a2c951e401ea8babd15d3cceb4bb25a1
diff --git a/services/camera/libcameraservice/camera3/Camera3OutputStream.cpp b/services/camera/libcameraservice/camera3/Camera3OutputStream.cpp index 276b940..ec8cf0d 100644 --- a/services/camera/libcameraservice/camera3/Camera3OutputStream.cpp +++ b/services/camera/libcameraservice/camera3/Camera3OutputStream.cpp
@@ -298,7 +298,7 @@ switch (mState) { case STATE_IN_RECONFIG: - res = disconnect(); + res = disconnectLocked(); if (res != OK) { return res; }