tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge changes from topic 'audio-primary-hal-vts-fix' into oc-dev

Browse source 
am: c558ddf3fa

Change-Id: I15868923cdfd165e20468d1c885a256fefd0eeca
This commit is contained in:
Kevin Rocard 2017-05-16 19:13:11 +00:00 committed by android-build-merger
commit cdf142d8dd
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
audio/2.0/default/PrimaryDevice.cpp
View file

@ -17,6 +17,7 @@
#define LOG_TAG "PrimaryDeviceHAL"
#include "PrimaryDevice.h"
#include "Util.h"
namespace android {
namespace hardware {
@ -126,6 +127,10 @@ Return<void> PrimaryDevice::debugDump(const hidl_handle& fd) {
// Methods from ::android::hardware::audio::V2_0::IPrimaryDevice follow.
Return<Result> PrimaryDevice::setVoiceVolume(float volume) {
if (!isGainNormalized(volume)) {
ALOGW("Can not set a voice volume (%f) outside [0,1]", volume);
return Result::INVALID_ARGUMENTS;
}
return mDevice->analyzeStatus(
"set_voice_volume",
mDevice->device()->set_voice_volume(mDevice->device(), volume));

14
audio/2.0/vts/functional/AudioPrimaryHidlHalTest.cpp
View file

@ -1038,16 +1038,12 @@ static void testUnitaryGain(std::function<Return<Result>(float)> setGain) {
for (float value :
(float[]){-INFINITY, -1.0, 1.0 + std::numeric_limits<float>::epsilon(),
2.0, INFINITY, NAN}) {
SCOPED_TRACE("value=" + to_string(value));
// FIXME: NAN should never be accepted
// FIXME: Missing api doc. What should the impl do if the volume is
// outside [0,1] ?
ASSERT_RESULT(Result::INVALID_ARGUMENTS, setGain(value));
EXPECT_RESULT(Result::INVALID_ARGUMENTS, setGain(value)) << "value="
<< value;
}
// Do not consider -0.0 as an invalid value as it is == with 0.0
for (float value : {-0.0, 0.0, 0.01, 0.5, 0.09, 1.0 /* Restore volume*/}) {
SCOPED_TRACE("value=" + to_string(value));
ASSERT_OK(setGain(value));
EXPECT_OK(setGain(value)) << "value=" << value;
}
}
@ -1076,7 +1072,7 @@ static void testPrepareForReading(IStreamIn* stream, uint32_t frameSize,
ASSERT_OK(stream->prepareForReading(
frameSize, framesCount,
[&res](auto r, auto&, auto&, auto&, auto&) { res = r; }));
EXPECT_RESULT(invalidArgsOrNotSupported, res);
EXPECT_RESULT(Result::INVALID_ARGUMENTS, res);
}
TEST_P(InputStreamTest, PrepareForReadingWithZeroBuffer) {
@ -1144,7 +1140,7 @@ static void testPrepareForWriting(IStreamOut* stream, uint32_t frameSize,
ASSERT_OK(stream->prepareForWriting(
frameSize, framesCount,
[&res](auto r, auto&, auto&, auto&, auto&) { res = r; }));
EXPECT_RESULT(invalidArgsOrNotSupported, res);
EXPECT_RESULT(Result::INVALID_ARGUMENTS, res);
}
TEST_P(OutputStreamTest, PrepareForWriteWithZeroBuffer) {