From 110342bd776c2a96a8a7a168a34dbca91843ee16 Mon Sep 17 00:00:00 2001
From: Yin-Chia Yeh <yinchiayeh@google.com>
Date: Mon, 19 Nov 2018 11:47:46 -0800
Subject: [PATCH] Camera: check stream state in useHalBufManager mode

Test: Surface abandon CTS test fixed.
Bug: 109829698
Change-Id: Ic2684098e129702f0ad8d8ce0af04a5195f29881
---
 services/camera/libcameraservice/device3/Camera3Device.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/services/camera/libcameraservice/device3/Camera3Device.cpp b/services/camera/libcameraservice/device3/Camera3Device.cpp
index d8fbaf53f9..732164d482 100644
--- a/services/camera/libcameraservice/device3/Camera3Device.cpp
+++ b/services/camera/libcameraservice/device3/Camera3Device.cpp
@@ -5398,6 +5398,10 @@ status_t Camera3Device::RequestThread::prepareHalRequests() {
             }
 
             if (mUseHalBufManager) {
+                if (outputStream->isAbandoned()) {
+                    ALOGE("%s: stream %d is abandoned.", __FUNCTION__, streamId);
+                    return TIMED_OUT;
+                }
                 // HAL will request buffer through requestStreamBuffer API
                 camera3_stream_buffer_t& buffer = outputBuffers->editItemAt(j);
                 buffer.stream = outputStream->asHalStream();