From 1df8c345854155cbbcb9f80de9d12d66ea70ac08 Mon Sep 17 00:00:00 2001 From: Jamie Gennis Date: Thu, 20 Dec 2012 14:05:45 -0800 Subject: libgui: disallow NULL Fence pointers This change eliminates the uses of a NULL sp indicating that no waiting is required. Instead we use a non-NULL but invalid Fence object for which the wait methods will return immediately. Bug: 7892871 Change-Id: I5360aebe3090422ef6920d56c99fc4eedc642e48 --- libs/gui/BufferItemConsumer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libs/gui/BufferItemConsumer.cpp') diff --git a/libs/gui/BufferItemConsumer.cpp b/libs/gui/BufferItemConsumer.cpp index 50798836c6..885b4e497f 100644 --- a/libs/gui/BufferItemConsumer.cpp +++ b/libs/gui/BufferItemConsumer.cpp @@ -62,7 +62,7 @@ status_t BufferItemConsumer::acquireBuffer(BufferItem *item, bool waitForFence) return err; } - if (waitForFence && item->mFence.get()) { + if (waitForFence) { err = item->mFence->waitForever(1000, "BufferItemConsumer::acquireBuffer"); if (err != OK) { BI_LOGE("Failed to wait for fence of acquired buffer: %s (%d)", -- cgit v1.2.3-59-g8ed1b