commit b14fef4aba730eba6bd0b1426b726ac77987158f
author Shuzhen Wang <shuzhenwang@google.com> Mon Jul 16 10:22:21 2018 -0700
committer Shuzhen Wang <shuzhenwang@google.com> Mon Jul 16 18:30:03 2018 +0000
tree 5dccd39f3416e752fe90edb813abafbffb08b187
parent a2a604341afe152682d4ba4f2b9990f6a74d9e34

Camera: Mark stream as ABANDONED if dequeueBuffer returns DEAD_OBJECT

When consumer surface is destroyed, dequeueBuffer may return
DEAD_OBJECT.

We need to treat this condition as ABANDONED so that camera service
stops repeating request. Otherwise, we may run into infinite loop.

Test: Camera CTS
Bug: 111384143
Bug: 111381452
Change-Id: If3348119521e9805085321c7f20abd7cc7f5dd43

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;
             }