Camera: Mark stream as ABANDONED if dequeueBuffer returns DEAD_OBJECT am: b14fef4aba

am: 495762ec07 Change-Id: I2d778d533ea244b648d8c832d7a16e752e850f7d
6 years ago · 4a7fd1f96f
parent a28995460a 495762ec07
commit 4a7fd1f96f
1 changed files with 1 additions and 1 deletions
--- a/services/camera/libcameraservice/device3/Camera3OutputStream.cpp
+++ b/services/camera/libcameraservice/device3/Camera3OutputStream.cpp
@ -564,7 +564,7 @@ status_t Camera3OutputStream::getBufferLockedCommon(ANativeWindowBuffer** anb, i

            // Only transition to STATE_ABANDONED from STATE_CONFIGURED. (If it is STATE_PREPARING,
            // let prepareNextBuffer handle the error.)
-            if (res == NO_INIT && mState == STATE_CONFIGURED) {
+            if ((res == NO_INIT || res == DEAD_OBJECT) && mState == STATE_CONFIGURED) {
                mState = STATE_ABANDONED;
            }