diff options
| author | Eric Laurent <elaurent@google.com> | 2012-03-01 10:17:21 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-03-01 10:17:21 -0800 |
| commit | c95cd6bca069b11720e9b27d13f2be09162ca832 (patch) | |
| tree | 535677b161d62f03b8459ca5694188ce65fb0b23 /include | |
| parent | 541b492d49167ad804f1ef2f13fd36f8284ac678 (diff) | |
| parent | 45d8c80dea625726f9d1a6d095161c059ce55e09 (diff) | |
| download | frameworks_base-c95cd6bca069b11720e9b27d13f2be09162ca832.zip frameworks_base-c95cd6bca069b11720e9b27d13f2be09162ca832.tar.gz frameworks_base-c95cd6bca069b11720e9b27d13f2be09162ca832.tar.bz2 | |
Merge "renamed audio policy output flag."
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/AudioSystem.h | 2 | ||||
| -rw-r--r-- | include/media/IAudioPolicyService.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/media/AudioSystem.h b/include/media/AudioSystem.h index 1916ac5..89bc95d 100644 --- a/include/media/AudioSystem.h +++ b/include/media/AudioSystem.h @@ -157,7 +157,7 @@ public: uint32_t samplingRate = 0, audio_format_t format = AUDIO_FORMAT_DEFAULT, uint32_t channels = AUDIO_CHANNEL_OUT_STEREO, - audio_policy_output_flags_t flags = AUDIO_POLICY_OUTPUT_FLAG_INDIRECT); + audio_policy_output_flags_t flags = AUDIO_POLICY_OUTPUT_FLAG_NONE); static status_t startOutput(audio_io_handle_t output, audio_stream_type_t stream, int session = 0); diff --git a/include/media/IAudioPolicyService.h b/include/media/IAudioPolicyService.h index 4d88297..bdd7747 100644 --- a/include/media/IAudioPolicyService.h +++ b/include/media/IAudioPolicyService.h @@ -52,7 +52,7 @@ public: uint32_t samplingRate = 0, audio_format_t format = AUDIO_FORMAT_DEFAULT, uint32_t channels = 0, - audio_policy_output_flags_t flags = AUDIO_POLICY_OUTPUT_FLAG_INDIRECT) = 0; + audio_policy_output_flags_t flags = AUDIO_POLICY_OUTPUT_FLAG_NONE) = 0; virtual status_t startOutput(audio_io_handle_t output, audio_stream_type_t stream, int session = 0) = 0; |