summaryrefslogtreecommitdiff
path: root/libs/ui/BufferHubBuffer.cpp
diff options
context:
space:
mode:
author Fan Xu <fanxu@google.com> 2018-11-21 15:03:32 -0800
committer Fan Xu <fanxu@google.com> 2018-12-12 14:35:50 -0800
commitcfbe07453ebd7cde74a7ed75568ee2c81d726049 (patch)
treeca279be9a83a1a78a93eaeed646fa38b49ee3071 /libs/ui/BufferHubBuffer.cpp
parentfaba0dc129e2d73bb8fc313bfa337baddb2582d6 (diff)
Move MetadataHeader to libui
To remove BufferHubMetadata off pdx dependency. Note that the __attribute__(packed) is removed as part of this CL, as it's not really needed and is triggering clang warnings. Test: build passed. Not test needed as no behavior changes. Bug: 118893702 Change-Id: Ifae94a143a2bedef68a653c57f089b95d166e6d7
Diffstat (limited to 'libs/ui/BufferHubBuffer.cpp')
-rw-r--r--libs/ui/BufferHubBuffer.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/ui/BufferHubBuffer.cpp b/libs/ui/BufferHubBuffer.cpp
index 3816c1bc4f..36eaed93ad 100644
--- a/libs/ui/BufferHubBuffer.cpp
+++ b/libs/ui/BufferHubBuffer.cpp
@@ -40,6 +40,7 @@
#include <android-base/unique_fd.h>
#include <ui/BufferHubBuffer.h>
+#include <ui/BufferHubDefs.h>
using android::base::unique_fd;
using android::dvr::BufferTraits;
@@ -69,7 +70,6 @@ using dvr::BufferHubDefs::IsClientGained;
using dvr::BufferHubDefs::IsClientPosted;
using dvr::BufferHubDefs::IsClientReleased;
using dvr::BufferHubDefs::kHighBitsMask;
-using dvr::BufferHubDefs::kMetadataHeaderSize;
} // namespace
@@ -161,7 +161,7 @@ int BufferHubBuffer::ImportGraphicBuffer() {
}
size_t metadataSize = static_cast<size_t>(bufferTraits.metadata_size());
- if (metadataSize < kMetadataHeaderSize) {
+ if (metadataSize < BufferHubDefs::kMetadataHeaderSize) {
ALOGE("BufferHubBuffer::ImportGraphicBuffer: metadata too small: %zu", metadataSize);
return -EINVAL;
}