diff options
author | koron393 <koron393@gmail.com> | 2019-09-16 01:29:47 +0900 |
---|---|---|
committer | Arian <arian.kulmer@web.de> | 2020-02-07 20:09:45 +0100 |
commit | 4d957a736845635f75cc8281d850c49d82b41275 (patch) | |
tree | b47e18ab4c57400e8877d64dcab8611bff71a57e /libshims/include | |
parent | 711a1b1a4ce5bd08a69aeca70a7b1431b3db9eda (diff) |
shinano-common: libshim_camera: Remove LIBUI_IN_VNDK ifdefs
* Fix build
Signed-off-by: koron393 <koron393@gmail.com>
Change-Id: I70f2be803b45c06e5a3b2a4ad8ce2ca6c2397a3f
Diffstat (limited to 'libshims/include')
-rw-r--r-- | libshims/include/ui/GraphicBuffer.h | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/libshims/include/ui/GraphicBuffer.h b/libshims/include/ui/GraphicBuffer.h index c195342..bc820b0 100644 --- a/libshims/include/ui/GraphicBuffer.h +++ b/libshims/include/ui/GraphicBuffer.h @@ -38,10 +38,6 @@ namespace android { -#ifndef LIBUI_IN_VNDK -class BufferHubBuffer; -#endif // LIBUI_IN_VNDK - class GraphicBufferMapper; using GraphicBufferDeathCallback = std::function<void(void* /*context*/, uint64_t bufferId)>; @@ -147,11 +143,6 @@ public: GraphicBuffer(uint32_t inWidth, uint32_t inHeight, PixelFormat inFormat, uint32_t inUsage, std::string requestorName = "<Unknown>"); -#ifndef LIBUI_IN_VNDK - // Create a GraphicBuffer from an existing BufferHubBuffer. - GraphicBuffer(std::unique_ptr<BufferHubBuffer> buffer); -#endif // LIBUI_IN_VNDK - // return status status_t initCheck() const; @@ -225,11 +216,6 @@ public: void addDeathCallback(GraphicBufferDeathCallback deathCallback, void* context); -#ifndef LIBUI_IN_VNDK - // Returns whether this GraphicBuffer is backed by BufferHubBuffer. - bool isBufferHubBuffer() const; -#endif // LIBUI_IN_VNDK - private: ~GraphicBuffer(); @@ -299,22 +285,6 @@ private: // and informs SurfaceFlinger that it should drop its strong pointer reference to the buffer. std::vector<std::pair<GraphicBufferDeathCallback, void* /*mDeathCallbackContext*/>> mDeathCallbacks; - -#ifndef LIBUI_IN_VNDK - // Flatten this GraphicBuffer object if backed by BufferHubBuffer. - status_t flattenBufferHubBuffer(void*& buffer, size_t& size) const; - - // Unflatten into BufferHubBuffer backed GraphicBuffer. - // Unflatten will fail if the original GraphicBuffer object is destructed. For instance, a - // GraphicBuffer backed by BufferHubBuffer_1 flatten in process/thread A, transport the token - // to process/thread B through a socket, BufferHubBuffer_1 dies and bufferhub invalidated the - // token. Race condition occurs between the invalidation of the token in bufferhub process and - // process/thread B trying to unflatten and import the buffer with that token. - status_t unflattenBufferHubBuffer(void const*& buffer, size_t& size); - - // Stores a BufferHubBuffer that handles buffer signaling, identification. - std::unique_ptr<BufferHubBuffer> mBufferHubBuffer; -#endif // LIBUI_IN_VNDK }; }; // namespace android |