summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Mathias Agopian <mathias@google.com> 2012-11-20 07:13:12 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2012-11-20 07:13:12 -0800
commitb171fe9f47f0082dae55d5a08fe9b379cbd8e33c (patch)
tree2b0e3454142301e69349f586b2663734f25ea69a
parentc763303eca5acf56a6d45157106d6277fb0887ab (diff)
parent594a8773c1ef5632a8eb2ef61a86c319460d4248 (diff)
am 594a8773: am 764c197c: fix typo that broke all the builds
* commit '594a8773c1ef5632a8eb2ef61a86c319460d4248': fix typo that broke all the builds
-rw-r--r--libs/gui/BufferQueue.cpp9
1 files changed, 3 insertions, 6 deletions
diff --git a/libs/gui/BufferQueue.cpp b/libs/gui/BufferQueue.cpp
index 607e0bdbec..086e298196 100644
--- a/libs/gui/BufferQueue.cpp
+++ b/libs/gui/BufferQueue.cpp
@@ -314,12 +314,9 @@ status_t BufferQueue::dequeueBuffer(int *outBuf, sp<Fence>& outFence,
* the consumer may still have pending reads of the
* buffers in flight.
*/
- if (found >= 0) {
- bool isOlder = mSlots[i].mFrameNumber <
- mSlots[found].mFrameNumber;
- if (isOlder) {
- found = i;
- }
+ if ((found < 0) ||
+ mSlots[i].mFrameNumber < mSlots[found].mFrameNumber) {
+ found = i;
}
}
}