Merge "Camera: Mark stream as ABANDONED if dequeueBuffer returns DEAD_OBJECT"

6 years ago · 1e1e06ba5f
parent 51d361e77c d9ef0e085d
commit 1e1e06ba5f
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;
            }