diff options
| author | Michael Lentine <mlentine@google.com> | 2014-07-30 17:19:32 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-25 21:16:23 +0000 |
| commit | cd36eb445bcc55c88e157584d9ac229280459463 (patch) | |
| tree | bc7388a53a8416de2b691c06de16304bf2f40929 /libs/gui | |
| parent | 330cf47336bc52e02a11954281486b38b3e7e6ad (diff) | |
| parent | 843cbb241da60ada234918a30cfe9a01a1e04187 (diff) | |
| download | frameworks_native-cd36eb445bcc55c88e157584d9ac229280459463.zip frameworks_native-cd36eb445bcc55c88e157584d9ac229280459463.tar.gz frameworks_native-cd36eb445bcc55c88e157584d9ac229280459463.tar.bz2 | |
Merge "Modify EGL to disconnect the window when the surface gets destroyed." into lmp-dev
Diffstat (limited to 'libs/gui')
| -rw-r--r-- | libs/gui/BufferQueueProducer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/gui/BufferQueueProducer.cpp b/libs/gui/BufferQueueProducer.cpp index a53775f..cbca3ac 100644 --- a/libs/gui/BufferQueueProducer.cpp +++ b/libs/gui/BufferQueueProducer.cpp @@ -830,8 +830,8 @@ status_t BufferQueueProducer::disconnect(int api) { mCore->mSidebandStream.clear(); mCore->mDequeueCondition.broadcast(); listener = mCore->mConsumerListener; - } else { - BQ_LOGE("disconnect(P): connected to another API " + } else if (mCore->mConnectedApi != BufferQueueCore::NO_CONNECTED_API) { + BQ_LOGE("disconnect(P): still connected to another API " "(cur=%d req=%d)", mCore->mConnectedApi, api); status = BAD_VALUE; } |