commit 05dbbb932feabb275bca81568646cea2e66592db
author The Android Automerger <android-build@android.com> Mon Nov 19 16:50:37 2012 -0800
committer The Android Automerger <android-build@android.com> Mon Nov 19 16:50:37 2012 -0800
tree 0408d0fdf0b16517683fc78fc7cb17839703eb60
parent ee932d0ad1a16cc93b4bd9eaf9cb3cc756fb2dfc
parent 87fe15c4fc233da26af7f9136e7cddc3d5c7711a

merge in jb-mr1.1-release history after reset to jb-mr1.1-dev

libs/gui/BufferQueue.cpp

diff --git a/libs/gui/BufferQueue.cpp b/libs/gui/BufferQueue.cpp
index 607e0bd..590946a 100644
--- a/libs/gui/BufferQueue.cpp
+++ b/libs/gui/BufferQueue.cpp
@@ -314,12 +314,10 @@
                      * 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;
-                        }
+                    bool isOlder = mSlots[i].mFrameNumber <
+                            mSlots[found].mFrameNumber;
+                    if (found < 0 || isOlder) {
+                        found = i;
                     }
                 }
             }