summaryrefslogtreecommitdiff
path: root/libs/gui/BufferQueueProducer.cpp
diff options
context:
space:
mode:
author Chong Zhang <chz@google.com> 2016-03-02 20:09:58 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2016-03-02 20:09:58 +0000
commit649449dbb777e58ea5f6f1af61f84022d088190c (patch)
treefb821a4b7f438ed5fe5f799e276285b1ddb631df /libs/gui/BufferQueueProducer.cpp
parent0258add8ec3269a70607d4d9fd4d90d2b9b83f67 (diff)
parent1b3a9acb77ee12568fa19740d8eeab165a0dcd98 (diff)
Merge "Add SurfaceControl::disconnect() to disconnect currently connected API" into nyc-dev
Diffstat (limited to 'libs/gui/BufferQueueProducer.cpp')
-rw-r--r--libs/gui/BufferQueueProducer.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/libs/gui/BufferQueueProducer.cpp b/libs/gui/BufferQueueProducer.cpp
index 17d4a2c818..818fac6613 100644
--- a/libs/gui/BufferQueueProducer.cpp
+++ b/libs/gui/BufferQueueProducer.cpp
@@ -1115,6 +1115,10 @@ status_t BufferQueueProducer::disconnect(int api) {
return NO_ERROR;
}
+ if (api == BufferQueueCore::CURRENTLY_CONNECTED_API) {
+ api = mCore->mConnectedApi;
+ }
+
switch (api) {
case NATIVE_WINDOW_API_EGL:
case NATIVE_WINDOW_API_CPU: