summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | am 376356d4: Merge "audio: do not use GNU old-style field designators"Nick Kralevich2013-11-061-12/+12
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | * commit '376356d4e0c135e710c6232e7e3f5c950247c848': audio: do not use GNU old-style field designators
| | * | | | Merge "audio: do not use GNU old-style field designators"Nick Kralevich2013-11-071-12/+12
| | |\ \ \ \
| | | * | | | audio: do not use GNU old-style field designatorssynergy dev2013-11-061-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoiding the use of gnu extensions improves code portability Change-Id: Ifa8f5d230de20a6284bb943c1ca3c48fd5fd5f2d
* | | | | | | am 7e7add70: am 2c14d798: Merge "Revert "audio: do not use GNU old-style ↵Elliott Hughes2013-11-061-12/+12
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | field designators"" * commit '7e7add707a4bc5a2c32553434e6b8b898af28ccc': Revert "audio: do not use GNU old-style field designators"
| * | | | | | am 2c14d798: Merge "Revert "audio: do not use GNU old-style field designators""Elliott Hughes2013-11-061-12/+12
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '2c14d79895593d4f8e1241b522cd3ce2d7225aaf': Revert "audio: do not use GNU old-style field designators"
| | * | | | | Merge "Revert "audio: do not use GNU old-style field designators""Elliott Hughes2013-11-071-12/+12
| | |\ \ \ \ \
| | | * | | | | Revert "audio: do not use GNU old-style field designators"Elliott Hughes2013-11-071-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit d2bd76e0dabdfbdd33265b68c6b519cce1d673c6. Change-Id: I6fb884cd0e1efa0c792521b67ed193420f6929ba
* | | | | | | | am e1ffc9aa: am 636ab7e2: Merge "audio: do not use GNU old-style field ↵Nick Kralevich2013-11-061-12/+12
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | designators" * commit 'e1ffc9aa462d53284fd1b788031592495957f7ec': audio: do not use GNU old-style field designators
| * | | | | | | am 636ab7e2: Merge "audio: do not use GNU old-style field designators"Nick Kralevich2013-11-061-12/+12
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | / / / | | |_|_|/ / / | |/| | | | | * commit '636ab7e2dd52c3cdad575a49b952c1235d734240': audio: do not use GNU old-style field designators
| | * | | | | Merge "audio: do not use GNU old-style field designators"Nick Kralevich2013-11-071-12/+12
| | |\ \ \ \ \ | | | |/ / / / | | | | / / / | | | |/ / / | | |/| | |
| | | * | | audio: do not use GNU old-style field designatorssynergy dev2013-11-061-12/+12
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Avoiding the use of gnu extensions improves code portability Change-Id: Ifa8f5d230de20a6284bb943c1ca3c48fd5fd5f2c
* | | | | am 758289be: Merge "audio policy: fix gapless playback when effects enabled" ↵Eric Laurent2013-10-292-5/+42
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | into klp-dev * commit '758289be1f05457db5dd4d29020cabd81efe66bb': audio policy: fix gapless playback when effects enabled
| * | | | Merge "audio policy: fix gapless playback when effects enabled" into klp-devEric Laurent2013-10-302-5/+42
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | audio policy: fix gapless playback when effects enabledEric Laurent2013-10-142-5/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not allow offloading if one non offloadable effect is enabled. This prevents from creating an offloaded track and tearing it down immediately after start when audioflinger detects there is an active non offloadable effect. Not doing so breaks gapless playback because AwesomePlayer will always be able to open an offloaded track which will not be compatible with the previous PCM track and Audiosink::open() will not recycle it. Bug: 11181933. Change-Id: I6d163806849d9093b9ec701ba8e8c1ccb658e3c8
* | | | | am c0ff7762: merge in klp-release (no-op)Ed Heyl2013-10-160-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'c0ff7762509131a5a95ee258fa6da881a23100a6': audio: fix remote submix sampling rates
| * | | | merge in klp-release (no-op)Ed Heyl2013-10-160-0/+0
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | merge in klp-release history after reset to klp-devThe Android Automerger2013-10-080-0/+0
| | |\ \ \ | |/ / / /
| | * | | merge in klp-release history after reset to klp-devThe Android Automerger2013-10-060-0/+0
| | |\ \ \
| | | * \ \ merge in klp-release history after reset to klp-devThe Android Automerger2013-10-020-0/+0
| | | |\ \ \
| | | | * | | audio: fix remote submix sampling ratesEric Laurent2013-09-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only list 48000 Hz in supported sampling rates for remote submix output and input stream profiles to avoid mismatch betwen playback and capture. Bug: 10900252. Change-Id: Id96e914caeb42e8f4aa5fe4e55e19156cdd67b58
* | | | | | | am b40b96a7: audio policy: fix direct output selectionEric Laurent2013-10-071-46/+45
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'b40b96a78537d63d801af7e706764c68acf8f182': audio policy: fix direct output selection
| * | | | | | audio policy: fix direct output selectionEric Laurent2013-10-071-46/+45
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit a527ffd broke the selection of an available direct output profile in getProfileForDirectOutput(). getProfileForDirectOutput() should check for direct output profiles regardless of the flags provided to getOutput(). Bug: 11051912. Change-Id: I4a84734331bfed03d6024ea1c2e8776c27d0b28f
* | | | | | wifi: Remove obsolete update_ctrl_interface() callDmitry Shmidt2013-10-041-87/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib57a87ae1ef5953b1ddcf43974b07f091f298e74 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | | | | | Merge "wifi: Sync with wpa_supplicant commit 5605286"Dmitry Shmidt2013-10-041-0/+6
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | wifi: Sync with wpa_supplicant commit 5605286Dmitry Shmidt2013-10-041-0/+6
| |/ / / / | | | | | | | | | | | | | | | | | | | | Change-Id: I43713275612f612e9d73ad555cac30e056b3c85a Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | | | | audio policy: fix DTMF tones volume while in callEric Laurent2013-10-031-1/+11
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When voice call stream volume is at 0, DTMF are not heard at all. DTMF volume should follow the behavior of voice call volume which is never completely muted. Bug: 10932676. Change-Id: Iaf0e33284be75b00516a837907e66be3123e5331
* | | | remove audio HAL warning when inserting a headsetEric Laurent2013-09-301-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A valid offload info structure must be provided when opening an offload output stream in checkOutputsForDevice() upon headset insertion. Bug: 8174034. Change-Id: Id800a206536e5ce979febf89747a51db581c53b6
* | | | audio: fix remote submix sampling ratesEric Laurent2013-09-261-2/+2
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | Only list 48000 Hz in supported sampling rates for remote submix output and input stream profiles to avoid mismatch betwen playback and capture. Bug: 10900252. Change-Id: Id96e914caeb42e8f4aa5fe4e55e19156cdd67b58
* | | audio policy: add support for audio effect offloadEric Laurent2013-09-172-21/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add rules to select the appropriate output for global effects. Move global effects if needed when an offloaded output is created or released. Bug: 8174034. Change-Id: I0bbd8e9f8aa717f672462dd74ba0d01eaef1fda7
* | | Merge "AudioPolicyManageBase changes to enable HOTWORD audio source" into ↵Eric Laurent2013-09-121-8/+22
|\ \ \ | | | | | | | | | | | | klp-dev
| * | | AudioPolicyManageBase changes to enable HOTWORD audio sourceEric Laurent2013-09-091-8/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - This change enables HOTWORD audio source to be preempted by any other audio source Bug: 10640877. Change-Id: I6f7acbe95a6521306db70ad73260d2ba7b38b940
* | | | audio policy: extend min duration for offloadEric Laurent2013-09-091-1/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | Extend minimun duration of offloaded audio content to 1 minute to avoid offloading short clips like TTS generated files. Bug: 8174034. Change-Id: Ied21557c300af4b27d99388e069576e36804087f
* | | audio policy: remove verbose logging.Eric Laurent2013-08-301-1/+1
| | | | | | | | | | | | Change-Id: I268935bd8f7e58f90c698c098686a04681b43887
* | | audio policy: disable audio offloading with videoEric Laurent2013-08-301-2/+9
| | | | | | | | | | | | | | | | | | | | | Do not enable offloading of audio decompression when playing video. Change-Id: I6ee8b59370219f5ef810a99a27ba4a1cf222b55b
* | | audio policy: allow virtual input even if there are active inputsChong Zhang2013-08-241-1/+1
| | | | | | | | | | | | | | | | | | Bug: 10460751 Change-Id: Ic6fcd14162e9c6e03366d887063321e21fcf14cd
* | | Automatically enable/disable remote submix when input started.Jeff Brown2013-08-192-1/+32
| | | | | | | | | | | | | | | | | | | | | | | | When recording from the audio submix begins, enable the remote audio submit output device. When it ends, disable it. Bug: 10265163 Change-Id: Ia0dc2e20623bb834d06561469ce856688991243b
* | | Use a single socket to communicate with supplicantVinit Deshapnde2013-08-082-151/+80
| | | | | | | | | | | | | | | | | | | | | | | | This helps to preapre for future updates from external sources. Bug: 9298955 Change-Id: I4c63ad5fc1ea3564aab38cfce955de19bad75c0c (cherry picked from commit 759cc323cb586192d591a815b0fb9d839536fcd6)
* | | Code changes for audio offload supportRichard Fitzgerald2013-07-245-50/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Share existing offload output if compatible instead of creating a new one. Hardware has limited number of offload channels (possible only 1) so we must use as few as possible - Changes to routing handling for offloaded outputs Change-Id: I11111d8f504828595bd8dbf66444cbd1202e7192 Signed-off-by: Eric Laurent <elaurent@google.com>
* | | am 4c7db154: (-s ours) Reconcile with jb-mr2-zeroday-release - do not mergeThe Android Open Source Project2013-07-160-0/+0
|\ \ \ | |/ / | | | | | | | | | * commit '4c7db154564031237df705641f27d504d4ae3f11': audio policy: apply default device volume
| * | Reconcile with jb-mr2-zeroday-release - do not mergeThe Android Open Source Project2013-07-160-0/+0
| |\ \ | | | | | | | | | | | | Change-Id: I44d1b4bc2d06e2ec3d7837693a1880d7e6cf1774
| | * | audio policy: apply default device volumeEric Laurent2013-07-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure that we apply default device volume to active outputs in case no specific volume for selected device is received afterward. Bug: 9760269. Change-Id: I216de40396e1075e77493c97e8b192cd3a31d546
* | | | am 8e7e4254: am e92d6238: audio policy: apply default device volumeEric Laurent2013-07-151-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '8e7e42547116b1d5f49118ba41946b2906ad3936': audio policy: apply default device volume
| * | | am e92d6238: audio policy: apply default device volumeEric Laurent2013-07-151-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit 'e92d623811f3fd3e7cc5e5dd8bc93c0c0a8fdf50': audio policy: apply default device volume
| | * | | audio policy: apply default device volumeEric Laurent2013-07-151-1/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure that we apply default device volume to active outputs in case no specific volume for selected device is received afterward. Bug: 9760269. Change-Id: I216de40396e1075e77493c97e8b192cd3a31d546
* | | | wifi: Sync with wpa_supplicant commit 1075b29Dmitry Shmidt2013-07-121-0/+5
| | | | | | | | | | | | | | | | | | | | Change-Id: I502a925054c13f3ceb43445e1c4703427ed4ca7f Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | | | Include header files used by this headerGlenn Kasten2013-07-021-0/+1
| | | | | | | | | | | | | | | | Change-Id: I36c6f580c698706b961150978e2124f9235eab12
* | | | Add audio policy API changes for audio offloadRichard Fitzgerald2013-06-276-11/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes to the API of audio policy for audio offload support: - Add isOffloadSupported() function - Add OUTPUT_FLAG_OFFLOAD - Extend AudioOutputDescriptor to include a sharing count for direct outputs - Pass audio_offload_info_t when opening output streams Change-Id: I5ad26418fdb286eb7ae299d586dd1fd525d48ab9 Signed-off-by: Richard Fitzgerald <rf@opensource.wolfsonmicro.com> Signed-off-by: Eric Laurent <elaurent@google.com>
* | | | am 248c9aa9: am 2769ce79: Merge "Use accessor to read property serial numbers"Colin Cross2013-06-170-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '248c9aa92c8f3e2f33a0e8a02436ea366266495f': Use accessor to read property serial numbers
| * | | am 2769ce79: Merge "Use accessor to read property serial numbers"Colin Cross2013-06-171-2/+2
| |\ \ \ | | |/ / | |/| | | | | | | | | | * commit '2769ce79def80023e454708deec176e3259dc586': Use accessor to read property serial numbers
| | * | Merge "Use accessor to read property serial numbers"Colin Cross2013-06-181-2/+2
| | |\ \ | | | |/ | | |/|