commit 26bb2b1c0d8f7b05feb40b0e5bf1bb384e1b5f55
author Chong Zhang <chz@google.com> Tue Mar 08 12:08:33 2016 -0800
committer Chong Zhang <chz@google.com> Tue Mar 08 12:10:08 2016 -0800
tree 238f6e2f677793a71b2cb94e418740e7ca11748b
parent 9c3e10b4bf83985f138821c5af7c804635242f29

Fix warning when force-disconnect but there is no connected API

It's not really an error, we can return early.

bug: 27295820
Change-Id: I450ca615cf9c33b9aaef9c31eec8217c97516df5

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) {