commit e2172bed7e77ab1d922588cf727818b481400b53
author Igor Murashkin <iam@google.com> Tue May 28 15:31:39 2013 -0700
committer Igor Murashkin <iam@google.com> Tue May 28 15:31:39 2013 -0700
tree 8a2fc11a21ed5c2b972e92fede7094d4a1d29e17
parent 1f7f83b7a1f2e2d01f808913ef0b869652c08949

camera3: Don't try to disconnect stream native windows more than once

This fixes the multiple-disconnect-from-BufferQueue bug.

(In logs)
BufferQueue: [SurfaceView] disconnect: connected to another api (cur=0, req=4)

Bug: 9114681
Change-Id: I21ae1c5bd993701eea13648aa9994979a24eb210

services/camera/libcameraservice/camera3/Camera3IOStreamBase.cpp

diff --git a/services/camera/libcameraservice/camera3/Camera3IOStreamBase.cpp b/services/camera/libcameraservice/camera3/Camera3IOStreamBase.cpp
index abc28fe..0850566 100644
--- a/services/camera/libcameraservice/camera3/Camera3IOStreamBase.cpp
+++ b/services/camera/libcameraservice/camera3/Camera3IOStreamBase.cpp
@@ -159,7 +159,9 @@
             break;
         default:
             // No connection, nothing to do
-            return OK;
+            ALOGV("%s: Stream %d: Already disconnected",
+                  __FUNCTION__, mId);
+            return -ENOTCONN;
     }
 
     if (mDequeuedBufferCount > 0) {