diff options
| author | Jamie Gennis <jgennis@google.com> | 2011-06-20 15:34:00 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-20 15:34:00 -0700 |
| commit | c972c795cfdb0d16d664510b5041e43cfdc2a5ac (patch) | |
| tree | ec8f0e4686903bdb3351f7d2129984d20ff8032d /include | |
| parent | b2af97e9a11119a257289cb8c539b5de79093052 (diff) | |
| parent | aff74054189a4276a250eac91ac301ab2df37ae3 (diff) | |
| download | frameworks_base-c972c795cfdb0d16d664510b5041e43cfdc2a5ac.zip frameworks_base-c972c795cfdb0d16d664510b5041e43cfdc2a5ac.tar.gz frameworks_base-c972c795cfdb0d16d664510b5041e43cfdc2a5ac.tar.bz2 | |
Merge "SurfaceTexture: fix a NULL ptr dereference."
Diffstat (limited to 'include')
| -rw-r--r-- | include/gui/SurfaceTextureClient.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/gui/SurfaceTextureClient.h b/include/gui/SurfaceTextureClient.h index e7c6e24..6ce44fc 100644 --- a/include/gui/SurfaceTextureClient.h +++ b/include/gui/SurfaceTextureClient.h @@ -80,6 +80,7 @@ private: int setUsage(uint32_t reqUsage); void freeAllBuffers(); + int getSlotFromBufferLocked(android_native_buffer_t* buffer) const; int getConnectedApi() const; |