commit afa8a910f065246c8c59386b8b0d9d96669ac85c
author Shuzhen Wang <shuzhenwang@google.com> Wed Mar 15 10:51:27 2017 -0700
committer Shuzhen Wang <shuzhenwang@google.com> Tue Mar 21 09:24:40 2017 -0700
tree d1242e9268c1fa28b299551239366aa36d57c273
parent e8ecda97764c45c86f71b50f7eff3e30ee9f540c

Camera: Do not crash if detachNextBuffer fails

Test: Camera CTS
Bug: 33777818
Change-Id: I965d741df6ce6bdb701dbe1d721cf42ea53c7a40

services/camera/libcameraservice/device3/Camera3StreamSplitter.cpp

diff --git a/services/camera/libcameraservice/device3/Camera3StreamSplitter.cpp b/services/camera/libcameraservice/device3/Camera3StreamSplitter.cpp
index bf6af86..869e93a 100644
--- a/services/camera/libcameraservice/device3/Camera3StreamSplitter.cpp
+++ b/services/camera/libcameraservice/device3/Camera3StreamSplitter.cpp
@@ -461,9 +461,9 @@
     } else if (res == NO_MEMORY) {
         SP_LOGV("%s: No free buffers", __FUNCTION__);
         return;
-    } else {
-        LOG_ALWAYS_FATAL_IF(res != NO_ERROR,
-                "detaching buffer from output failed (%d)", res);
+    } else if (res != OK) {
+        SP_LOGE("%s: detaching buffer from output failed (%d)", __FUNCTION__, res);
+        return;
     }
 
     BufferTracker& tracker = *(mBuffers[buffer->getId()]);