diff options
| author | Jamie Gennis <jgennis@google.com> | 2013-02-13 23:22:04 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-02-13 23:22:04 +0000 |
| commit | b997f6ef0f3fa7cf67fd7487b88e5d6ac0bb15e9 (patch) | |
| tree | 640c13270504ecc91c21bdc62a0b8397a4a5426f /libs/gui/tests/BufferQueue_test.cpp | |
| parent | c8a1e10fd2465509685d382c79d7c059db8491ac (diff) | |
| parent | c52e16cbf9798b95188c82465dfd84b914ff5199 (diff) | |
| download | frameworks_native-b997f6ef0f3fa7cf67fd7487b88e5d6ac0bb15e9.zip frameworks_native-b997f6ef0f3fa7cf67fd7487b88e5d6ac0bb15e9.tar.gz frameworks_native-b997f6ef0f3fa7cf67fd7487b88e5d6ac0bb15e9.tar.bz2 | |
Merge changes I50831d4e,I5360aebe
* changes:
flatland: remove an unneeded #include
libgui: disallow NULL Fence pointers
Diffstat (limited to 'libs/gui/tests/BufferQueue_test.cpp')
| -rw-r--r-- | libs/gui/tests/BufferQueue_test.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/gui/tests/BufferQueue_test.cpp b/libs/gui/tests/BufferQueue_test.cpp index 12cbfb0..93f8faf 100644 --- a/libs/gui/tests/BufferQueue_test.cpp +++ b/libs/gui/tests/BufferQueue_test.cpp @@ -71,7 +71,7 @@ TEST_F(BufferQueueTest, AcquireBuffer_ExceedsMaxAcquireCount_Fails) { sp<Fence> fence; sp<GraphicBuffer> buf; IGraphicBufferProducer::QueueBufferInput qbi(0, Rect(0, 0, 1, 1), - NATIVE_WINDOW_SCALING_MODE_FREEZE, 0, fence); + NATIVE_WINDOW_SCALING_MODE_FREEZE, 0, Fence::NO_FENCE); BufferQueue::BufferItem item; for (int i = 0; i < 2; i++) { |