diff options
| author | Michael Lentine <mlentine@google.com> | 2015-05-14 16:39:27 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-14 16:39:28 +0000 |
| commit | 51c8c502f63624af8090fe42477b95791faec2c9 (patch) | |
| tree | ce63e6a5c4d12693def3b6aa4ff7b5634afbf586 /libs | |
| parent | 7c000280a57f352c2485dcaea1d5bfe20f7bfe63 (diff) | |
| parent | 00699fa64197cc72a160d69e1f0003cdd43dc136 (diff) | |
| download | frameworks_native-51c8c502f63624af8090fe42477b95791faec2c9.zip frameworks_native-51c8c502f63624af8090fe42477b95791faec2c9.tar.gz frameworks_native-51c8c502f63624af8090fe42477b95791faec2c9.tar.bz2 | |
Merge "Modify EGL to disconnect the window when the surface gets destroyed." into mnc-dev
Diffstat (limited to 'libs')
| -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 e318484..2cf7433 100644 --- a/libs/gui/BufferQueueProducer.cpp +++ b/libs/gui/BufferQueueProducer.cpp @@ -914,8 +914,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; } |