diff options
| author | Dan Stoza <stoza@google.com> | 2015-04-24 16:12:30 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-24 16:12:30 +0000 |
| commit | 5d10894c9d547449cf231f02b736da9dfdebec11 (patch) | |
| tree | 044bac73db4f13ac47f91e7a0cab9f12ffdb1619 /libs/gui/BufferQueueCore.cpp | |
| parent | 437fb850b0667be3e8655cb1ac6a8d491f59d045 (diff) | |
| parent | ef47c080fd0e7fb8bf1fc4b0ecadae277a22f2cf (diff) | |
| download | frameworks_native-5d10894c9d547449cf231f02b736da9dfdebec11.zip frameworks_native-5d10894c9d547449cf231f02b736da9dfdebec11.tar.gz frameworks_native-5d10894c9d547449cf231f02b736da9dfdebec11.tar.bz2 | |
am ef47c080: am 958f5011: Merge "libgui: Allow an IGBProducer to disable allocation"
* commit 'ef47c080fd0e7fb8bf1fc4b0ecadae277a22f2cf':
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()); |