diff options
| author | Mike Stroyan <stroyan@google.com> | 2016-06-06 16:29:41 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-06-06 16:29:42 +0000 |
| commit | 09e5f59bc9a371c7b83153bb51543ec759684227 (patch) | |
| tree | df653b153ff5f54f909962e97430d77f77ad02c7 | |
| parent | 02afa28ccdb2cd82a51f938777944c2c8cf857ce (diff) | |
| parent | 87709c91ffad0cbe92e6b45cc13a2902b3170a2d (diff) | |
| download | native-09e5f59bc9a371c7b83153bb51543ec759684227.tar.gz | |
Merge "libgui: Check result in hook_dequeueBuffer_DEPRECATED" into nyc-dev
| -rw-r--r-- | libs/gui/Surface.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libs/gui/Surface.cpp b/libs/gui/Surface.cpp index 6811269a39..9d130cd974 100644 --- a/libs/gui/Surface.cpp +++ b/libs/gui/Surface.cpp @@ -162,6 +162,9 @@ int Surface::hook_dequeueBuffer_DEPRECATED(ANativeWindow* window, ANativeWindowBuffer* buf; int fenceFd = -1; int result = c->dequeueBuffer(&buf, &fenceFd); + if (result != OK) { + return result; + } sp<Fence> fence(new Fence(fenceFd)); int waitResult = fence->waitForever("dequeueBuffer_DEPRECATED"); if (waitResult != OK) { |