commit 5a8cb035ae02eff00d73ecdcc65b4952a26b9124
author Shuzhen Wang <shuzhenwang@google.com> Tue May 23 20:08:07 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue May 23 20:08:07 2017 +0000
tree a636eb07653361a2bfb6fceb81662b8091547984
parent bce1deadafc06d5a7d5fa78ee26602f565260028
parent fe614d7b37f5e1529de5437c45aead65150737fe

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

Change-Id: I24d58521c267ecf576160ac037d433c595c78960

libs/gui/Surface.cpp

diff --git a/libs/gui/Surface.cpp b/libs/gui/Surface.cpp
index 94d8578..83ebbe8 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);
             }