summaryrefslogtreecommitdiff
path: root/libs/ui/GraphicBuffer.cpp
diff options
context:
space:
mode:
author Jiwen 'Steve' Cai <jwcai@google.com> 2018-10-15 11:31:29 -0700
committer Jiwen 'Steve' Cai <jwcai@google.com> 2018-11-01 11:57:31 -0700
commit77565571fc884e74cdf7a7b9ed0cbf37a70b6747 (patch)
tree6a94c3a45eb6ea0ebd50b2689186ba425d22e0ee /libs/ui/GraphicBuffer.cpp
parent81dea27e84bac1715db94995ca27ba517cbdc71d (diff)
Remove DetachedBufferHandle from libui
DetachedBufferHandle was a temporary measure introduced in Android P to bridge BufferHub and GraphicBuffer. In Android Q however, GraphicBuffer will be directly backed by BufferHub, thus DetachedBufferHandle becomes redundant. Also note that removing DetachedBufferHandle from libui should bare no impact on vendors for two reasons: 1. BufferHub in P is only enabled for Daydream ready devices (i.e. Pixel lines and VR AIO devices). No other vendors should have BufferHub enabled. 2. DetachedBufferHandle.h was hidden from vndk and thus vendors shouldn't get access to it anyway. Bug: 117522732 Test: Build system Change-Id: I3828eaa9499051e5ad5e4e270b5c26bae5f2c707
Diffstat (limited to 'libs/ui/GraphicBuffer.cpp')
-rw-r--r--libs/ui/GraphicBuffer.cpp19
1 files changed, 0 insertions, 19 deletions
diff --git a/libs/ui/GraphicBuffer.cpp b/libs/ui/GraphicBuffer.cpp
index c50d1d038e..5a1ddee002 100644
--- a/libs/ui/GraphicBuffer.cpp
+++ b/libs/ui/GraphicBuffer.cpp
@@ -22,7 +22,6 @@
#include <grallocusage/GrallocUsageConversion.h>
-#include <ui/DetachedBufferHandle.h>
#include <ui/Gralloc2.h>
#include <ui/GraphicBufferAllocator.h>
#include <ui/GraphicBufferMapper.h>
@@ -490,24 +489,6 @@ status_t GraphicBuffer::unflatten(
return NO_ERROR;
}
-bool GraphicBuffer::isDetachedBuffer() const {
- return mDetachedBufferHandle && mDetachedBufferHandle->isValid();
-}
-
-status_t GraphicBuffer::setDetachedBufferHandle(std::unique_ptr<DetachedBufferHandle> channel) {
- if (isDetachedBuffer()) {
- ALOGW("setDetachedBuffer: there is already a BufferHub channel associated with this "
- "GraphicBuffer. Replacing the old one.");
- }
-
- mDetachedBufferHandle = std::move(channel);
- return NO_ERROR;
-}
-
-std::unique_ptr<DetachedBufferHandle> GraphicBuffer::takeDetachedBufferHandle() {
- return std::move(mDetachedBufferHandle);
-}
-
// ---------------------------------------------------------------------------
}; // namespace android