diff options
| -rw-r--r-- | audio/AudioPolicyManagerBase.cpp | 42 | ||||
| -rw-r--r-- | include/hardware_legacy/AudioPolicyManagerBase.h | 2 | ||||
| -rw-r--r-- | wifi/wifi.c | 8 |
3 files changed, 31 insertions, 21 deletions
diff --git a/audio/AudioPolicyManagerBase.cpp b/audio/AudioPolicyManagerBase.cpp index 4682e39..35dd219 100644 --- a/audio/AudioPolicyManagerBase.cpp +++ b/audio/AudioPolicyManagerBase.cpp @@ -1611,13 +1611,13 @@ status_t AudioPolicyManagerBase::checkOutputsForDevice(audio_devices_t device, // nothing to do if one output is already opened for this profile size_t j; - for (j = 0; j < outputs.size(); j++) { + for (j = 0; j < mOutputs.size(); j++) { desc = mOutputs.valueAt(j); if (!desc->isDuplicated() && desc->mProfile == profile) { break; } } - if (j != outputs.size()) { + if (j != mOutputs.size()) { continue; } @@ -2617,12 +2617,22 @@ const AudioPolicyManagerBase::VolumeCurvePoint }; const AudioPolicyManagerBase::VolumeCurvePoint + AudioPolicyManagerBase::sDefaultVoiceVolumeCurve[AudioPolicyManagerBase::VOLCNT] = { + {0, -42.0f}, {33, -28.0f}, {66, -14.0f}, {100, 0.0f} +}; + +const AudioPolicyManagerBase::VolumeCurvePoint + AudioPolicyManagerBase::sSpeakerVoiceVolumeCurve[AudioPolicyManagerBase::VOLCNT] = { + {0, -24.0f}, {33, -16.0f}, {66, -8.0f}, {100, 0.0f} +}; + +const AudioPolicyManagerBase::VolumeCurvePoint *AudioPolicyManagerBase::sVolumeProfiles[AUDIO_STREAM_CNT] [AudioPolicyManagerBase::DEVICE_CATEGORY_CNT] = { { // AUDIO_STREAM_VOICE_CALL - sDefaultVolumeCurve, // DEVICE_CATEGORY_HEADSET - sDefaultVolumeCurve, // DEVICE_CATEGORY_SPEAKER - sDefaultVolumeCurve // DEVICE_CATEGORY_EARPIECE + sDefaultVoiceVolumeCurve, // DEVICE_CATEGORY_HEADSET + sSpeakerVoiceVolumeCurve, // DEVICE_CATEGORY_SPEAKER + sDefaultVoiceVolumeCurve // DEVICE_CATEGORY_EARPIECE }, { // AUDIO_STREAM_SYSTEM sHeadsetSystemVolumeCurve, // DEVICE_CATEGORY_HEADSET @@ -2650,9 +2660,9 @@ const AudioPolicyManagerBase::VolumeCurvePoint sDefaultVolumeCurve // DEVICE_CATEGORY_EARPIECE }, { // AUDIO_STREAM_BLUETOOTH_SCO - sDefaultVolumeCurve, // DEVICE_CATEGORY_HEADSET - sDefaultVolumeCurve, // DEVICE_CATEGORY_SPEAKER - sDefaultVolumeCurve // DEVICE_CATEGORY_EARPIECE + sDefaultVoiceVolumeCurve, // DEVICE_CATEGORY_HEADSET + sSpeakerVoiceVolumeCurve, // DEVICE_CATEGORY_SPEAKER + sDefaultVoiceVolumeCurve // DEVICE_CATEGORY_EARPIECE }, { // AUDIO_STREAM_ENFORCED_AUDIBLE sHeadsetSystemVolumeCurve, // DEVICE_CATEGORY_HEADSET @@ -2776,19 +2786,11 @@ status_t AudioPolicyManagerBase::checkAndSetVolume(int stream, force) { mOutputs.valueFor(output)->mCurVolume[stream] = volume; ALOGVV("checkAndSetVolume() for output %d stream %d, volume %f, delay %d", output, stream, volume, delayMs); - if (stream == AudioSystem::VOICE_CALL || - stream == AudioSystem::DTMF || - stream == AudioSystem::BLUETOOTH_SCO) { - // offset value to reflect actual hardware volume that never reaches 0 - // 1% corresponds roughly to first step in VOICE_CALL stream volume setting (see AudioService.java) - volume = 0.01 + 0.99 * volume; - // Force VOICE_CALL to track BLUETOOTH_SCO stream volume when bluetooth audio is - // enabled - if (stream == AudioSystem::BLUETOOTH_SCO) { - mpClientInterface->setStreamVolume(AudioSystem::VOICE_CALL, volume, output, delayMs); - } + // Force VOICE_CALL to track BLUETOOTH_SCO stream volume when bluetooth audio is + // enabled + if (stream == AudioSystem::BLUETOOTH_SCO) { + mpClientInterface->setStreamVolume(AudioSystem::VOICE_CALL, volume, output, delayMs); } - mpClientInterface->setStreamVolume((AudioSystem::stream_type)stream, volume, output, delayMs); } diff --git a/include/hardware_legacy/AudioPolicyManagerBase.h b/include/hardware_legacy/AudioPolicyManagerBase.h index 4eefc0a..451fe8a 100644 --- a/include/hardware_legacy/AudioPolicyManagerBase.h +++ b/include/hardware_legacy/AudioPolicyManagerBase.h @@ -227,6 +227,8 @@ protected: static const VolumeCurvePoint sSpeakerSonificationVolumeCurve[AudioPolicyManagerBase::VOLCNT]; static const VolumeCurvePoint sDefaultSystemVolumeCurve[AudioPolicyManagerBase::VOLCNT]; static const VolumeCurvePoint sHeadsetSystemVolumeCurve[AudioPolicyManagerBase::VOLCNT]; + static const VolumeCurvePoint sDefaultVoiceVolumeCurve[AudioPolicyManagerBase::VOLCNT]; + static const VolumeCurvePoint sSpeakerVoiceVolumeCurve[AudioPolicyManagerBase::VOLCNT]; // default volume curves per stream and device category. See initializeVolumeCurves() static const VolumeCurvePoint *sVolumeProfiles[AUDIO_STREAM_CNT][DEVICE_CATEGORY_CNT]; diff --git a/wifi/wifi.c b/wifi/wifi.c index f669693..d62b30f 100644 --- a/wifi/wifi.c +++ b/wifi/wifi.c @@ -728,7 +728,13 @@ int wifi_ctrl_recv(int index, char *reply, size_t *reply_len) if (rfds[0].revents & POLLIN) { return wpa_ctrl_recv(monitor_conn[index], reply, reply_len); } else if (rfds[1].revents & POLLIN) { - wifi_close_sockets(index); + /* Close only the p2p sockets on receive side + * see wifi_close_supplicant_connection() + */ + if (index == SECONDARY) { + ALOGD("close sockets %d", index); + wifi_close_sockets(index); + } } return -2; } |