diff options
author | Glenn Kasten <gkasten@google.com> | 2012-01-20 10:07:06 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-01-20 10:07:06 -0800 |
commit | 7524a592526a14d20ec3f3acffd61fe18afaa4b4 (patch) | |
tree | 2eb574a61a11e29cf85c502fafe38098c1908455 /include/media | |
parent | 1b4d60497c6c89ae1457e802446c83ca7c8c0017 (diff) | |
parent | ee7fea9f2fd536107450204c9c2058bbe215f713 (diff) | |
download | frameworks_base-7524a592526a14d20ec3f3acffd61fe18afaa4b4.zip frameworks_base-7524a592526a14d20ec3f3acffd61fe18afaa4b4.tar.gz frameworks_base-7524a592526a14d20ec3f3acffd61fe18afaa4b4.tar.bz2 |
Merge "Remove dead setRingerMode(mode, mask)"
Diffstat (limited to 'include/media')
-rw-r--r-- | include/media/AudioSystem.h | 1 | ||||
-rw-r--r-- | include/media/IAudioPolicyService.h | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/include/media/AudioSystem.h b/include/media/AudioSystem.h index 4415d33..49e5690 100644 --- a/include/media/AudioSystem.h +++ b/include/media/AudioSystem.h @@ -149,7 +149,6 @@ public: static status_t setDeviceConnectionState(audio_devices_t device, audio_policy_dev_state_t state, const char *device_address); static audio_policy_dev_state_t getDeviceConnectionState(audio_devices_t device, const char *device_address); static status_t setPhoneState(audio_mode_t state); - static status_t setRingerMode(uint32_t mode, uint32_t mask); static status_t setForceUse(audio_policy_force_use_t usage, audio_policy_forced_cfg_t config); static audio_policy_forced_cfg_t getForceUse(audio_policy_force_use_t usage); static audio_io_handle_t getOutput(audio_stream_type_t stream, diff --git a/include/media/IAudioPolicyService.h b/include/media/IAudioPolicyService.h index a83d806..8ddbe0a 100644 --- a/include/media/IAudioPolicyService.h +++ b/include/media/IAudioPolicyService.h @@ -46,7 +46,6 @@ public: virtual audio_policy_dev_state_t getDeviceConnectionState(audio_devices_t device, const char *device_address) = 0; virtual status_t setPhoneState(audio_mode_t state) = 0; - virtual status_t setRingerMode(uint32_t mode, uint32_t mask) = 0; virtual status_t setForceUse(audio_policy_force_use_t usage, audio_policy_forced_cfg_t config) = 0; virtual audio_policy_forced_cfg_t getForceUse(audio_policy_force_use_t usage) = 0; virtual audio_io_handle_t getOutput(audio_stream_type_t stream, |