diff options
author | Jesse Hall <jessehall@google.com> | 2013-09-16 15:24:53 -0700 |
---|---|---|
committer | Jesse Hall <jessehall@google.com> | 2013-09-16 15:39:55 -0700 |
commit | 83cafffeac037ab2f9d00f98f8d2f3da8fc9b857 (patch) | |
tree | 4782c75b3790ab1772a62b6d29d63c5ec4d11046 /libs/gui/SurfaceControl.cpp | |
parent | 90ed3e8d7883d9c80fb8bf11b1c593bd8b2b39d0 (diff) | |
download | frameworks_native-83cafffeac037ab2f9d00f98f8d2f3da8fc9b857.zip frameworks_native-83cafffeac037ab2f9d00f98f8d2f3da8fc9b857.tar.gz frameworks_native-83cafffeac037ab2f9d00f98f8d2f3da8fc9b857.tar.bz2 |
Stop using default value for Surface producerControlledByApp parameter
Bug: 10785749
Change-Id: Ifbf9340e5eabe621a69e990ec3e05ac51f8db66a
Diffstat (limited to 'libs/gui/SurfaceControl.cpp')
-rw-r--r-- | libs/gui/SurfaceControl.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/libs/gui/SurfaceControl.cpp b/libs/gui/SurfaceControl.cpp index f4e88f5..16e533c 100644 --- a/libs/gui/SurfaceControl.cpp +++ b/libs/gui/SurfaceControl.cpp @@ -46,13 +46,13 @@ namespace android { // ============================================================================ SurfaceControl::SurfaceControl( - const sp<SurfaceComposerClient>& client, + const sp<SurfaceComposerClient>& client, const sp<IBinder>& handle, const sp<IGraphicBufferProducer>& gbp) : mClient(client), mHandle(handle), mGraphicBufferProducer(gbp) { } - + SurfaceControl::~SurfaceControl() { destroy(); @@ -71,7 +71,7 @@ void SurfaceControl::destroy() IPCThreadState::self()->flushCommands(); } -void SurfaceControl::clear() +void SurfaceControl::clear() { // here, the window manager tells us explicitly that we should destroy // the surface's resource. Soon after this call, it will also release @@ -83,7 +83,7 @@ void SurfaceControl::clear() } bool SurfaceControl::isSameSurface( - const sp<SurfaceControl>& lhs, const sp<SurfaceControl>& rhs) + const sp<SurfaceControl>& lhs, const sp<SurfaceControl>& rhs) { if (lhs == 0 || rhs == 0) return false; @@ -181,7 +181,9 @@ sp<Surface> SurfaceControl::getSurface() const { Mutex::Autolock _l(mLock); if (mSurfaceData == 0) { - mSurfaceData = new Surface(mGraphicBufferProducer); + // This surface is always consumed by SurfaceFlinger, so the + // producerControlledByApp value doesn't matter; using false. + mSurfaceData = new Surface(mGraphicBufferProducer, false); } return mSurfaceData; } |