commit 55be505a75a379b10a945b3de81fbebe2b85a344
author Shuzhen Wang <shuzhenwang@google.com> Tue May 23 09:41:54 2017 -0700
committer Shuzhen Wang <shuzhenwang@google.com> Tue May 23 09:46:24 2017 -0700
tree 2ce953854a3fec7256c66d285cd8cc2f1dccb4f8
parent b667c05f03f9dbd66b75aa39f4e60d2690d828eb

Surface: Use buffer id to synchronize slots

For the same buffer, GraphicBuffer's buffer_handle_t* may change when
doing attach/detach. Use Id instead.

Test: Call attach/detach, and observe mRemovedBuffers is updated
Bug: 38238747
Change-Id: I6ab1ae5340565f98cb981b7e38c31a4f85190e56

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);
             }