diff options
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/AudioPolicyManagerBase.cpp | 12 | ||||
| -rw-r--r-- | audio/audio_policy_hal.cpp | 3 |
2 files changed, 2 insertions, 13 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) diff --git a/audio/audio_policy_hal.cpp b/audio/audio_policy_hal.cpp index 7d2e1e0..e997a81 100644 --- a/audio/audio_policy_hal.cpp +++ b/audio/audio_policy_hal.cpp @@ -95,8 +95,7 @@ static void ap_set_phone_state(struct audio_policy *pol, audio_mode_t state) static void ap_set_ringer_mode(struct audio_policy *pol, uint32_t mode, uint32_t mask) { - struct legacy_audio_policy *lap = to_lap(pol); - lap->apm->setRingerMode(mode, mask); + // deprecated, never called } /* force using a specific device category for the specified usage */ |