diff options
| author | Kevin Rocard <krocard@google.com> | 2018-11-10 07:20:17 -0800 |
|---|---|---|
| committer | Kevin Rocard <krocard@google.com> | 2018-12-02 17:59:45 -0800 |
| commit | 20614ba60443d820737c966a197998214d645189 (patch) | |
| tree | 09ffd828a225d434da83871c8086c3ed4cfea0f7 /audio/core/all-versions/default/Stream.cpp | |
| parent | e665264cfd369cb6aad71999a8083506424022f4 (diff) | |
Audio HAL V5: Introduce HAL V5, equal to V4 for now
find -name 4.0 | xargs -I@ cp -r @ @/../5.0
find 5.0 */5.0 -type f | xargs sed -Ei 's/V4/V5/;s#(@|/)4.0#\15.0#'
find -name *cpp -o -name *.h | xargs sed -i 's/VERSION == 4/VERSION >= 4/g'
mv {4.1,5.0}/config/audio_policy_configuration.xsd
Then a manual update to Android.bp to add V5 support.
Then a manual update to service.cpp to add support for loading 5.0.
If someone knows a way to avoid copying the .hal, it would be great.
They will be 99% identical between V4 and V5.
Bug: 118203066
Test: vts-tradefed run commandAndExit vts --module VtsHalAudioEffectV2_0Target
vts-tradefed run commandAndExit vts --module VtsHalAudioV2_0Target
vts-tradefed run commandAndExit vts --module VtsHalAudioEffectV4_0Target
vts-tradefed run commandAndExit vts --module VtsHalAudioV4_0Target
Change-Id: If99a5645d19c9780019704ea4f51f8114d83ee8f
Signed-off-by: Kevin Rocard <krocard@google.com>
Diffstat (limited to 'audio/core/all-versions/default/Stream.cpp')
| -rw-r--r-- | audio/core/all-versions/default/Stream.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/audio/core/all-versions/default/Stream.cpp b/audio/core/all-versions/default/Stream.cpp index f9a202bc7a..b995657087 100644 --- a/audio/core/all-versions/default/Stream.cpp +++ b/audio/core/all-versions/default/Stream.cpp @@ -113,7 +113,7 @@ Return<void> Stream::getSupportedSampleRates(AudioFormat format, } #if MAJOR_VERSION == 2 _hidl_cb(sampleRates); -#elif MAJOR_VERSION == 4 +#elif MAJOR_VERSION >= 4 _hidl_cb(result, sampleRates); #endif return Void(); @@ -142,7 +142,7 @@ Return<void> Stream::getSupportedChannelMasks(AudioFormat format, } #if MAJOR_VERSION == 2 _hidl_cb(channelMasks); -#elif MAJOR_VERSION == 4 +#elif MAJOR_VERSION >= 4 _hidl_cb(result, channelMasks); #endif return Void(); @@ -246,7 +246,7 @@ Return<Result> Stream::setConnectedState(const DeviceAddress& address, bool conn connected ? AudioParameter::keyStreamConnect : AudioParameter::keyStreamDisconnect, address); } -#elif MAJOR_VERSION == 4 +#elif MAJOR_VERSION >= 4 Return<void> Stream::getDevices(getDevices_cb _hidl_cb) { int device = 0; Result retval = getParam(AudioParameter::keyRouting, &device); |