BufferHub{Buffer,Metadata}: Some other minor changes
1/ Move BufferHubMetadata out of android::dvr namespace
2/ Fix some misnamed variables
Bug: 111976433
Test: BufferHubBuffer_test
Change-Id: I06ec1c3cc4831c865b672680b49adb006d6e1835
diff --git a/libs/ui/include/ui/BufferHubBuffer.h b/libs/ui/include/ui/BufferHubBuffer.h
index e8ae244..d33be8c 100644
--- a/libs/ui/include/ui/BufferHubBuffer.h
+++ b/libs/ui/include/ui/BufferHubBuffer.h
@@ -88,7 +88,7 @@
// A state mask which is unique to a buffer hub client among all its siblings sharing the same
// concrete graphic buffer.
- uint64_t buffer_state_bit() const { return mBfferStateBit; }
+ uint64_t buffer_state_bit() const { return mBufferStateBit; }
size_t user_metadata_size() const { return mMetadata.user_metadata_size(); }
@@ -130,15 +130,15 @@
int ImportGraphicBuffer();
// Global id for the buffer that is consistent across processes.
- int mId;
- uint64_t mBfferStateBit;
+ int mId = -1;
+ uint64_t mBufferStateBit = 0;
// Wrapps the gralloc buffer handle of this buffer.
dvr::NativeHandleWrapper<pdx::LocalHandle> mBufferHandle;
// An ashmem-based metadata object. The same shared memory are mapped to the
// bufferhubd daemon and all buffer clients.
- dvr::BufferHubMetadata mMetadata;
+ BufferHubMetadata mMetadata;
// PDX backend.
BufferHubClient mClient;