am 49385ec7: Merge "When disconnecting a surface, cancel don\'t queue the buffer" into jb-mr2-dev

* commit '49385ec7c361347a69245c8a0838f6d03343a1de':
  When disconnecting a surface, cancel don't queue the buffer
This commit is contained in:
Jesse Hall 2013-03-07 23:47:04 +00:00 committed by Android Git Automerger
commit 1fd01cecf5

View File

@ -420,9 +420,8 @@ void egl_window_surface_v2_t::disconnect()
bits = NULL;
unlock(buffer);
}
// enqueue the last frame
nativeWindow->queueBuffer(nativeWindow, buffer, -1);
if (buffer) {
nativeWindow->cancelBuffer(nativeWindow, buffer, -1);
buffer->common.decRef(&buffer->common);
buffer = 0;
}