diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2010-11-17 09:49:23 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-11-17 09:49:23 -0800 |
| commit | 05b07fd204cc9cc340dc579db17008bf9e8161fd (patch) | |
| tree | 94cb3ddb9cae774750cf40c6d6c58f848e257272 /include | |
| parent | 1bf397ffbdaae9a5354c9bb0b5121c4a9f1c8c76 (diff) | |
| parent | 8f677d66d9c3ba34c97e69b2bb9e161f129af0ee (diff) | |
| download | frameworks_base-05b07fd204cc9cc340dc579db17008bf9e8161fd.zip frameworks_base-05b07fd204cc9cc340dc579db17008bf9e8161fd.tar.gz frameworks_base-05b07fd204cc9cc340dc579db17008bf9e8161fd.tar.bz2 | |
Merge "Add new audio mode for audio communications other than telelphony."
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: |