ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

am bc930eda: Move dequeue-buffer-and-wait out-of-line

Browse source 
* commit 'bc930eda3985cf50bb568aeb098cd0585d0c0ce0':
  Move dequeue-buffer-and-wait out-of-line
This commit is contained in:
Jesse Hall 2012-10-01 23:30:48 -07:00 • committed by Android Git Automerger
commit 069f5dadbe
1 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
include/system/window.h
View file

@ -18,6 +18,7 @@
#define SYSTEM_CORE_INCLUDE_ANDROID_WINDOW_H
#include <cutils/native_handle.h>
#include <errno.h>
#include <limits.h>
#include <stdint.h>
#include <string.h>
@ -824,17 +825,7 @@ static inline int native_window_api_disconnect(
*/
static inline int native_window_dequeue_buffer_and_wait(ANativeWindow *anw,
struct ANativeWindowBuffer** anb) {
int fenceFd = -1;
int err = anw->dequeueBuffer(anw, anb, &fenceFd);
if (err == 0 && fenceFd != -1) {
err = sync_wait(fenceFd, UINT_MAX);
close(fenceFd);
if (err != 0) {
anw->cancelBuffer(anw, *anb, -1);
*anb = NULL;
}
}
return err;
return anw->dequeueBuffer_DEPRECATED(anw, anb);
}