summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Stoza <stoza@google.com>2015-05-12 21:57:27 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-05-12 21:57:28 +0000
commit48cb8310e267d177856ad9b2af7b9949d7d62424 (patch)
tree6dfaa7c63f87399694426659df212c51bde3ded4
parentaf8ed3f06cf5a0fd37357b438da803f53f33fa56 (diff)
parent2b83cc920ac98498bee161e2b0e7befdfc82ca2b (diff)
downloadframeworks_native-48cb8310e267d177856ad9b2af7b9949d7d62424.tar.gz
frameworks_native-48cb8310e267d177856ad9b2af7b9949d7d62424.tar.bz2
frameworks_native-48cb8310e267d177856ad9b2af7b9949d7d62424.zip
Merge "libgui: Always allow allocation on connect" into mnc-dev
-rw-r--r--libs/gui/BufferQueueProducer.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/libs/gui/BufferQueueProducer.cpp b/libs/gui/BufferQueueProducer.cpp
index 7251d369a..e318484d4 100644
--- a/libs/gui/BufferQueueProducer.cpp
+++ b/libs/gui/BufferQueueProducer.cpp
@@ -871,6 +871,7 @@ status_t BufferQueueProducer::connect(const sp<IProducerListener>& listener,
mCore->mBufferHasBeenQueued = false;
mCore->mDequeueBufferCannotBlock =
mCore->mConsumerControlledByApp && producerControlledByApp;
+ mCore->mAllowAllocation = true;
return status;
}