commit fe614d7b37f5e1529de5437c45aead65150737fe
author Shuzhen Wang <shuzhenwang@google.com> Tue May 23 19:59:44 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue May 23 19:59:44 2017 +0000
tree d60722da41e99745d89c0167d7fbed03b7af8dc3
parent 1ae167bef4b57b1d6c77066e30340a38bf347506
parent adf0ad20909b8196ce18ccaacf62599e078c9509

Merge "Surface: Use buffer id to synchronize slots" into oc-dev
am: adf0ad2090

Change-Id: I01b8012c941001530678f944670a083e34b7ebc6

libs/gui/Surface.cpp

diff --git a/libs/gui/Surface.cpp b/libs/gui/Surface.cpp
index ff0a5d4..6583a62 100644
--- a/libs/gui/Surface.cpp
+++ b/libs/gui/Surface.cpp
@@ -1231,7 +1231,7 @@
 
     for (int i = 0; i < NUM_BUFFER_SLOTS; i++) {
         if (mSlots[i].buffer != NULL &&
-                mSlots[i].buffer->handle == buffer->handle) {
+                mSlots[i].buffer->getId() == buffer->getId()) {
             if (mReportRemovedBuffers) {
                 mRemovedBuffers.push_back(mSlots[i].buffer);
             }