commit 87fe15c4fc233da26af7f9136e7cddc3d5c7711a
author The Android Automerger <android-build@android.com> Mon Nov 19 16:13:13 2012 -0800
committer The Android Automerger <android-build@android.com> Mon Nov 19 16:13:13 2012 -0800
tree e6c909940f07580998c920be587c0fbcc77eb8b3
parent 2a8c49eb5dd51b2e60c9a78bea00870867d91c03
parent 93f838b3a6ccf6a6a17b0bc345391b139c34185d

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 590946a..607e0bd 100644
--- a/libs/gui/BufferQueue.cpp
+++ b/libs/gui/BufferQueue.cpp
@@ -314,10 +314,12 @@
                      * the consumer may still have pending reads of the
                      * buffers in flight.
                      */
-                    bool isOlder = mSlots[i].mFrameNumber <
-                            mSlots[found].mFrameNumber;
-                    if (found < 0 || isOlder) {
-                        found = i;
+                    if (found >= 0) {
+                        bool isOlder = mSlots[i].mFrameNumber <
+                                mSlots[found].mFrameNumber;
+                        if (isOlder) {
+                            found = i;
+                        }
                     }
                 }
             }

services/surfaceflinger/DisplayHardware/HWComposer.cpp

diff --git a/services/surfaceflinger/DisplayHardware/HWComposer.cpp b/services/surfaceflinger/DisplayHardware/HWComposer.cpp
index 2eb74b7..29b778d 100644
--- a/services/surfaceflinger/DisplayHardware/HWComposer.cpp
+++ b/services/surfaceflinger/DisplayHardware/HWComposer.cpp
@@ -804,7 +804,7 @@
         getLayer()->acquireFenceFd = fenceFd;
     }
     virtual void setPerFrameDefaultState() {
-        //getLayer()->compositionType = HWC_FRAMEBUFFER;
+        getLayer()->compositionType = HWC_FRAMEBUFFER;
     }
     virtual void setDefaultState() {
         getLayer()->compositionType = HWC_FRAMEBUFFER;