summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandroid-build-team Robot2018-04-22 02:28:49 -0500
committerandroid-build-team Robot2018-04-22 02:28:49 -0500
commitd89f95414fc715c0e89b4a5da47aa9bd277736a1 (patch)
tree3b4f0777b35824e0b89ea70d35a7dcf3eb1f8af9 /audio/core/all-versions/default/include/core/all-versions/default/PrimaryDevice.impl.h
parentcb0ee29e765a3f5076b90019f1c22636979ea2f4 (diff)
parent63abd8fdbc05ba5534141ae93816572e24b33289 (diff)
downloadplatform-hardware-interfaces-d89f95414fc715c0e89b4a5da47aa9bd277736a1.tar.gz
platform-hardware-interfaces-d89f95414fc715c0e89b4a5da47aa9bd277736a1.tar.xz
platform-hardware-interfaces-d89f95414fc715c0e89b4a5da47aa9bd277736a1.zip
Snap for 4736748 from 63abd8fdbc05ba5534141ae93816572e24b33289 to pi-release
Change-Id: Icd5ce28c284b6b7a8f1024158be663861bf10635
Diffstat (limited to 'audio/core/all-versions/default/include/core/all-versions/default/PrimaryDevice.impl.h')
-rw-r--r--audio/core/all-versions/default/include/core/all-versions/default/PrimaryDevice.impl.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/audio/core/all-versions/default/include/core/all-versions/default/PrimaryDevice.impl.h b/audio/core/all-versions/default/include/core/all-versions/default/PrimaryDevice.impl.h
index 9b39d9c9..61ffbe00 100644
--- a/audio/core/all-versions/default/include/core/all-versions/default/PrimaryDevice.impl.h
+++ b/audio/core/all-versions/default/include/core/all-versions/default/PrimaryDevice.impl.h
@@ -160,7 +160,7 @@ Return<Result> PrimaryDevice::setConnectedState(const DeviceAddress& address, bo
160 160
161// Methods from ::android::hardware::audio::AUDIO_HAL_VERSION::IPrimaryDevice follow. 161// Methods from ::android::hardware::audio::AUDIO_HAL_VERSION::IPrimaryDevice follow.
162Return<Result> PrimaryDevice::setVoiceVolume(float volume) { 162Return<Result> PrimaryDevice::setVoiceVolume(float volume) {
163 if (!all_versions::implementation::isGainNormalized(volume)) { 163 if (!isGainNormalized(volume)) {
164 ALOGW("Can not set a voice volume (%f) outside [0,1]", volume); 164 ALOGW("Can not set a voice volume (%f) outside [0,1]", volume);
165 return Result::INVALID_ARGUMENTS; 165 return Result::INVALID_ARGUMENTS;
166 } 166 }
@@ -248,7 +248,7 @@ Return<Result> PrimaryDevice::setBtHfpSampleRate(uint32_t sampleRateHz) {
248 return mDevice->setParam(AUDIO_PARAMETER_KEY_HFP_SET_SAMPLING_RATE, int(sampleRateHz)); 248 return mDevice->setParam(AUDIO_PARAMETER_KEY_HFP_SET_SAMPLING_RATE, int(sampleRateHz));
249} 249}
250Return<Result> PrimaryDevice::setBtHfpVolume(float volume) { 250Return<Result> PrimaryDevice::setBtHfpVolume(float volume) {
251 if (!all_versions::implementation::isGainNormalized(volume)) { 251 if (!isGainNormalized(volume)) {
252 ALOGW("Can not set BT HFP volume (%f) outside [0,1]", volume); 252 ALOGW("Can not set BT HFP volume (%f) outside [0,1]", volume);
253 return Result::INVALID_ARGUMENTS; 253 return Result::INVALID_ARGUMENTS;
254 } 254 }