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 /include | |
| 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 'include')
| -rw-r--r-- | include/hardware_legacy/AudioPolicyInterface.h | 2 | ||||
| -rw-r--r-- | include/hardware_legacy/AudioPolicyManagerBase.h | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/include/hardware_legacy/AudioPolicyInterface.h b/include/hardware_legacy/AudioPolicyInterface.h index ff24565..9743489 100644 --- a/include/hardware_legacy/AudioPolicyInterface.h +++ b/include/hardware_legacy/AudioPolicyInterface.h @@ -74,8 +74,6 @@ public: const char *device_address) = 0; // indicate a change in phone state. Valid phones states are defined by AudioSystem::audio_mode virtual void setPhoneState(int state) = 0; - // indicate a change in ringer mode - virtual void setRingerMode(uint32_t mode, uint32_t mask) = 0; // force using a specific device category for the specified usage virtual void setForceUse(AudioSystem::force_use usage, AudioSystem::forced_config config) = 0; // retrieve current device category forced for a given usage diff --git a/include/hardware_legacy/AudioPolicyManagerBase.h b/include/hardware_legacy/AudioPolicyManagerBase.h index 24368e3..2a37200 100644 --- a/include/hardware_legacy/AudioPolicyManagerBase.h +++ b/include/hardware_legacy/AudioPolicyManagerBase.h @@ -70,7 +70,6 @@ public: virtual AudioSystem::device_connection_state getDeviceConnectionState(AudioSystem::audio_devices device, const char *device_address); virtual void setPhoneState(int state); - virtual void setRingerMode(uint32_t mode, uint32_t mask); virtual void setForceUse(AudioSystem::force_use usage, AudioSystem::forced_config config); virtual AudioSystem::forced_config getForceUse(AudioSystem::force_use usage); virtual void setSystemProperty(const char* property, const char* value); @@ -357,7 +356,6 @@ protected: uint32_t mAvailableOutputDevices; // bit field of all available output devices uint32_t mAvailableInputDevices; // bit field of all available input devices int mPhoneState; // current phone state - uint32_t mRingerMode; // current ringer mode AudioSystem::forced_config mForceUse[AudioSystem::NUM_FORCE_USE]; // current forced use configuration StreamDescriptor mStreams[AudioSystem::NUM_STREAM_TYPES]; // stream descriptors for volume control |