From 1850da231eafb185add6db88251343a6e6e333db Mon Sep 17 00:00:00 2001
From: Jiwen 'Steve' Cai <jwcai@google.com>
Date: Mon, 15 Oct 2018 21:29:14 -0700
Subject: 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
---
 libs/ui/BufferHubMetadata.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'libs/ui/BufferHubMetadata.cpp')

diff --git a/libs/ui/BufferHubMetadata.cpp b/libs/ui/BufferHubMetadata.cpp
index b0c451061d..1e08ed1388 100644
--- a/libs/ui/BufferHubMetadata.cpp
+++ b/libs/ui/BufferHubMetadata.cpp
@@ -22,7 +22,6 @@
 #include <ui/BufferHubMetadata.h>
 
 namespace android {
-namespace dvr {
 
 namespace {
 
@@ -30,8 +29,8 @@ static const int kAshmemProt = PROT_READ | PROT_WRITE;
 
 } // namespace
 
-using BufferHubDefs::kMetadataHeaderSize;
-using BufferHubDefs::MetadataHeader;
+using dvr::BufferHubDefs::kMetadataHeaderSize;
+using dvr::BufferHubDefs::MetadataHeader;
 
 /* static */
 BufferHubMetadata BufferHubMetadata::Create(size_t userMetadataSize) {
@@ -101,5 +100,4 @@ BufferHubMetadata::~BufferHubMetadata() {
     }
 }
 
-} // namespace dvr
 } // namespace android
-- 
cgit v1.2.3-59-g8ed1b