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 | b36bb97ae37a0fbcb6a35770eb86ac5931409d0d (patch) | |
| tree | 7d104592dfa60cad98ea1265ebae798943514651 /include | |
| parent | 24f3ebb27588a991686cb0faa3633deb892a56bf (diff) | |
| parent | 1c4414091cfb93206067fb64eba445653739d40f (diff) | |
| download | frameworks_native-b36bb97ae37a0fbcb6a35770eb86ac5931409d0d.zip frameworks_native-b36bb97ae37a0fbcb6a35770eb86ac5931409d0d.tar.gz frameworks_native-b36bb97ae37a0fbcb6a35770eb86ac5931409d0d.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; |