diff options
| author | Dan Stoza <stoza@google.com> | 2015-04-24 16:00:22 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-24 16:00:22 +0000 |
| commit | ef47c080fd0e7fb8bf1fc4b0ecadae277a22f2cf (patch) | |
| tree | c432d8b7cb66096784acd7745bc1a29f0a7ad076 /libs/gui/BufferQueueCore.cpp | |
| parent | f96a758139be0d5c298abad8e27083b0f0849818 (diff) | |
| parent | 958f501189a29e53767f41bc8172e4af8d1ce2bf (diff) | |
| download | frameworks_native-ef47c080fd0e7fb8bf1fc4b0ecadae277a22f2cf.zip frameworks_native-ef47c080fd0e7fb8bf1fc4b0ecadae277a22f2cf.tar.gz frameworks_native-ef47c080fd0e7fb8bf1fc4b0ecadae277a22f2cf.tar.bz2 | |
am 958f5011: Merge "libgui: Allow an IGBProducer to disable allocation"
* commit '958f501189a29e53767f41bc8172e4af8d1ce2bf':
libgui: Allow an IGBProducer to disable allocation
Diffstat (limited to 'libs/gui/BufferQueueCore.cpp')
| -rw-r--r-- | libs/gui/BufferQueueCore.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/gui/BufferQueueCore.cpp b/libs/gui/BufferQueueCore.cpp index 29415c9..bc75ca7 100644 --- a/libs/gui/BufferQueueCore.cpp +++ b/libs/gui/BufferQueueCore.cpp @@ -69,7 +69,8 @@ BufferQueueCore::BufferQueueCore(const sp<IGraphicBufferAlloc>& allocator) : mFrameCounter(0), mTransformHint(0), mIsAllocating(false), - mIsAllocatingCondition() + mIsAllocatingCondition(), + mAllowAllocation(true) { if (allocator == NULL) { sp<ISurfaceComposer> composer(ComposerService::getComposerService()); |