| commit | cd333fe74677da852cc05dcb24c9e7e4614377ec | [log] [tgz] |
|---|---|---|
| author | Yin-Chia Yeh <yinchiayeh@google.com> | Fri Feb 08 13:45:41 2019 -0800 |
| committer | Yin-Chia Yeh <yinchiayeh@google.com> | Wed Feb 13 11:06:18 2019 -0800 |
| tree | 8f6b5f27a5d510da3bf2027601d6eb514c5c7bd8 | |
| parent | ffb2516cc730b5ac621ad8a92e827faf4e86b8ca [diff] [blame] |
Camera: bug fixes for HAL buffer manager Test: GCA smoke test + Camera CTS Bug: 120986771 Change-Id: I946fb95d8e685995ebb8cf3d36b0373958bfad09
diff --git a/services/camera/libcameraservice/device3/Camera3Stream.cpp b/services/camera/libcameraservice/device3/Camera3Stream.cpp index d29e5c0..0571741 100644 --- a/services/camera/libcameraservice/device3/Camera3Stream.cpp +++ b/services/camera/libcameraservice/device3/Camera3Stream.cpp
@@ -588,7 +588,11 @@ if (mState != STATE_CONFIGURED) { ALOGE("%s: Stream %d: Can't get buffers if stream is not in CONFIGURED state %d", __FUNCTION__, mId, mState); - return INVALID_OPERATION; + if (mState == STATE_ABANDONED) { + return DEAD_OBJECT; + } else { + return INVALID_OPERATION; + } } // Wait for new buffer returned back if we are running into the limit.