commit 495762ec079ccb5f1dcbee41d8bda2f0c998bf1a
author Shuzhen Wang <shuzhenwang@google.com> Mon Jul 16 16:28:16 2018 -0700
committer android-build-merger <android-build-merger@google.com> Mon Jul 16 16:28:16 2018 -0700
tree f85ebaed68a721ee28a2db58beb0a2078d85842a
parent a3faf10d5590b9ca2e7655d106749c14c6085bdc
parent b14fef4aba730eba6bd0b1426b726ac77987158f

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

Change-Id: I262930305347f12f698875df90302138aff2d337

services/camera/libcameraservice/device3/Camera3OutputStream.cpp

diff --git a/services/camera/libcameraservice/device3/Camera3OutputStream.cpp b/services/camera/libcameraservice/device3/Camera3OutputStream.cpp
index b3c3717..2c020a2 100644
--- a/services/camera/libcameraservice/device3/Camera3OutputStream.cpp
+++ b/services/camera/libcameraservice/device3/Camera3OutputStream.cpp
@@ -564,7 +564,7 @@
 
             // 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;
             }