diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-01-20 10:07:13 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-01-20 10:07:13 -0800 |
| commit | ba1e8cb245b1395fa6dd8a3eb9fe92a3d8a99adf (patch) | |
| tree | 630434b5b7956f89aba53e21596d989cef8f62ba /audio/AudioPolicyManagerBase.cpp | |
| parent | 902ec630b6abc9bf6c247e21ff4a829c58a93ce9 (diff) | |
| parent | ca0657a1ca087a6d474a75fcfedd6aac3901d587 (diff) | |
| download | hardware_libhardware_legacy-ba1e8cb245b1395fa6dd8a3eb9fe92a3d8a99adf.zip hardware_libhardware_legacy-ba1e8cb245b1395fa6dd8a3eb9fe92a3d8a99adf.tar.gz hardware_libhardware_legacy-ba1e8cb245b1395fa6dd8a3eb9fe92a3d8a99adf.tar.bz2 | |
Merge "Audio policy HAL set_ringer_mode is deprecated"
Diffstat (limited to 'audio/AudioPolicyManagerBase.cpp')
| -rw-r--r-- | audio/AudioPolicyManagerBase.cpp | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/audio/AudioPolicyManagerBase.cpp b/audio/AudioPolicyManagerBase.cpp index 12df7bd..3d198dc 100644 --- a/audio/AudioPolicyManagerBase.cpp +++ b/audio/AudioPolicyManagerBase.cpp @@ -319,13 +319,6 @@ void AudioPolicyManagerBase::setPhoneState(int state) } } -void AudioPolicyManagerBase::setRingerMode(uint32_t mode, uint32_t mask) -{ - ALOGV("setRingerMode() mode %x, mask %x", mode, mask); - - mRingerMode = mode; -} - void AudioPolicyManagerBase::setForceUse(AudioSystem::force_use usage, AudioSystem::forced_config config) { ALOGV("setForceUse() usage %d, config %d, mPhoneState %d", usage, config, mPhoneState); @@ -1026,9 +1019,6 @@ status_t AudioPolicyManagerBase::dump(int fd) result.append(buffer); snprintf(buffer, SIZE, " Phone state: %d\n", mPhoneState); result.append(buffer); -// disable ringer mode dump until it is actually passed by AudioService when needed. -// snprintf(buffer, SIZE, " Ringer mode: %d\n", mRingerMode); -// result.append(buffer); snprintf(buffer, SIZE, " Force use for communications %d\n", mForceUse[AudioSystem::FOR_COMMUNICATION]); result.append(buffer); snprintf(buffer, SIZE, " Force use for media %d\n", mForceUse[AudioSystem::FOR_MEDIA]); @@ -1091,7 +1081,7 @@ AudioPolicyManagerBase::AudioPolicyManagerBase(AudioPolicyClientInterface *clien #ifdef AUDIO_POLICY_TEST Thread(false), #endif //AUDIO_POLICY_TEST - mPhoneState(AudioSystem::MODE_NORMAL), mRingerMode(0), + mPhoneState(AudioSystem::MODE_NORMAL), mLimitRingtoneVolume(false), mLastVoiceVolume(-1.0f), mTotalEffectsCpuLoad(0), mTotalEffectsMemory(0), mA2dpSuspended(false) |