commit 82a7ddc4b1ddc76df553c2633ce3bfe72bb9319b
author Chong Zhang <chz@google.com> Tue Mar 08 20:36:45 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 08 20:36:45 2016 +0000
tree dfdaa3408308d2875f244e427571678aad160883
parent de497fd5759f3c7e1c5479875e09a4db771278ba
parent 26bb2b1c0d8f7b05feb40b0e5bf1bb384e1b5f55

Merge "Fix warning when force-disconnect but there is no connected API" into nyc-dev

libs/gui/BufferQueueProducer.cpp

diff --git a/libs/gui/BufferQueueProducer.cpp b/libs/gui/BufferQueueProducer.cpp
index 818fac6..e9d0654 100644
--- a/libs/gui/BufferQueueProducer.cpp
+++ b/libs/gui/BufferQueueProducer.cpp
@@ -1117,6 +1117,11 @@
 
         if (api == BufferQueueCore::CURRENTLY_CONNECTED_API) {
             api = mCore->mConnectedApi;
+            // If we're asked to disconnect the currently connected api but
+            // nobody is connected, it's not really an error.
+            if (api == BufferQueueCore::NO_CONNECTED_API) {
+                return NO_ERROR;
+            }
         }
 
         switch (api) {