summaryrefslogtreecommitdiff
path: root/libs/gui/BufferQueue.cpp
diff options
context:
space:
mode:
author Andy McFadden <fadden@android.com> 2013-08-02 22:34:13 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2013-08-02 22:34:13 +0000
commitd9ba9707b0ab5c53e34d8ce9a5e71c41b85bb8da (patch)
treea530f96ac820166b0baa7b0fdb9a953acffc2f8a /libs/gui/BufferQueue.cpp
parentc1c39f8807f5b3dad9ca221d912f7cd4f4f74d9c (diff)
parent4b49e08385a96398aa2633e096fe916dc9f08768 (diff)
Merge "Roll back recent change"
Diffstat (limited to 'libs/gui/BufferQueue.cpp')
-rw-r--r--libs/gui/BufferQueue.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/gui/BufferQueue.cpp b/libs/gui/BufferQueue.cpp
index 73f0b1decc..ac7f299069 100644
--- a/libs/gui/BufferQueue.cpp
+++ b/libs/gui/BufferQueue.cpp
@@ -861,7 +861,7 @@ status_t BufferQueue::acquireBuffer(BufferItem *buffer, nsecs_t expectedPresent)
//
// NOTE: code assumes monotonic time values from the system clock are
// positive.
- while (mQueue.size() > 1) {
+ while (false && mQueue.size() > 1) {
// If entry[1] is timely, drop entry[0] (and repeat). We apply
// an additional criteria here: we only drop the earlier buffer if
// our desiredPresent falls within +/- 1 second of the expected