diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2010-11-15 12:11:32 -0800 |
|---|---|---|
| committer | Jean-Michel Trivi <jmtrivi@google.com> | 2010-11-16 10:23:37 -0800 |
| commit | f1fb01a7f00b8da90a36268aba8584a872e99175 (patch) | |
| tree | faa835310fc53729ef0bc3e46914f830b414d4d7 /include | |
| parent | 8fff6bb0000e43f02c9d04ca90f941fdefdc1356 (diff) | |
| download | frameworks_av-f1fb01a7f00b8da90a36268aba8584a872e99175.zip frameworks_av-f1fb01a7f00b8da90a36268aba8584a872e99175.tar.gz frameworks_av-f1fb01a7f00b8da90a36268aba8584a872e99175.tar.bz2 | |
Add new audio mode for audio communications other than telelphony.
The audio mode MODE_IN_CALL signals the system the device a phone
call is currently underway. There was no way for audio video
chat or VoIP applications to signal a call is underway, but not
using the telephony resources. This change introduces a new mode
to address this. Changes in other parts of the system (java
and native) are required to take this new mode into account.
The generic AudioPolicyManager is updated to not use its phone
state variable directly, but to use two new convenience methods,
isInCall() and isStateInCall(int) instead.
Change-Id: Id744cd26520ea1d1a4795eabe6a1f0c58789af76
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/AudioSystem.h | 1 | ||||
| -rw-r--r-- | include/media/EffectApi.h | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/include/media/AudioSystem.h b/include/media/AudioSystem.h index cce2400..1e29d82 100644 --- a/include/media/AudioSystem.h +++ b/include/media/AudioSystem.h @@ -156,6 +156,7 @@ public: MODE_NORMAL = 0, MODE_RINGTONE, MODE_IN_CALL, + MODE_IN_COMMUNICATION, NUM_MODES // not a valid entry, denotes end-of-list }; diff --git a/include/media/EffectApi.h b/include/media/EffectApi.h index 16fb43c..b97c22e 100644 --- a/include/media/EffectApi.h +++ b/include/media/EffectApi.h @@ -602,9 +602,9 @@ enum audio_device_e { // Audio mode enum audio_mode_e { - AUDIO_MODE_NORMAL, // phone idle - AUDIO_MODE_RINGTONE, // phone ringing - AUDIO_MODE_IN_CALL // phone call connected + AUDIO_MODE_NORMAL, // device idle + AUDIO_MODE_RINGTONE, // device ringing + AUDIO_MODE_IN_CALL // audio call connected (VoIP or telephony) }; // Values for "accessMode" field of buffer_config_t: |