diff options
author | Mikhail Naganov <mnaganov@google.com> | 2018-12-11 16:36:53 -0800 |
---|---|---|
committer | Mikhail Naganov <mnaganov@google.com> | 2018-12-11 16:54:29 -0800 |
commit | 543bf9cb161e173bed2a733c2ce442cea90bacd8 (patch) | |
tree | 72f130c23da38e645f763d5f7448e71aa4c676b9 /audio/core/all-versions/default/Device.cpp | |
parent | 315002043adfb811bbe65934052c3be5b7ebd123 (diff) |
Audio HAL: Simplify types updates for 'common' and 'audio' packages
Instead of importing every single type individually ("using <type>"),
import entire namespaces of
::android::hardware::audio::CPP_VERSION and
::android::hardware::audio::common::CPP_VERSION
inside the "implementation" namespace in the default implementation.
This simplifies modifying types, as it is not needed anymore
to surround "using <type>" directives with #if MAJOR_VERSION ...
Note that the contents of the namespaces are imported inside
the "implementation" namespace, which reduces risks of name collision
Also, fixed the namespace for HidlUtils--it needs to be in
'implementation'.
Test: make
Change-Id: I81bbb3074b5763717ae72e747a075fd46dc36d18
Diffstat (limited to 'audio/core/all-versions/default/Device.cpp')
-rw-r--r-- | audio/core/all-versions/default/Device.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/audio/core/all-versions/default/Device.cpp b/audio/core/all-versions/default/Device.cpp index 6a04903a16..8e0b763d76 100644 --- a/audio/core/all-versions/default/Device.cpp +++ b/audio/core/all-versions/default/Device.cpp @@ -31,14 +31,14 @@ #include <android/log.h> -using ::android::hardware::audio::common::CPP_VERSION::HidlUtils; - namespace android { namespace hardware { namespace audio { namespace CPP_VERSION { namespace implementation { +using ::android::hardware::audio::common::CPP_VERSION::implementation::HidlUtils; + Device::Device(audio_hw_device_t* device) : mDevice(device) {} Device::~Device() { |