summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Use audio_in_acoustics_t consistently"Glenn Kasten2012-02-034-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Use audio_in_acoustics_t consistentlyGlenn Kasten2012-01-274-4/+4
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9875afdf21937c88a5decc9d94e89fddffc3519e
* | | | | | | | | | | | | | | | | | | | | | | | | | | am 7490f9bf: am b4ff7281: Reconcile with ics-mr1-releaseThe Android Open Source Project2012-02-010-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7490f9bf37a1bfcad8e6c868d878dd56fd4c09ca':
| * | | | | | | | | | | | | | | | | | | | | | | | | | am b4ff7281: Reconcile with ics-mr1-releaseThe Android Open Source Project2012-02-010-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b4ff728122f67ae9bf0f5afe4ff65b3ba3068b59':
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Reconcile with ics-mr1-releaseThe Android Open Source Project2012-02-010-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibf33a69673d9acafb9199d331fc88a7d80dbeb20
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Use audio_source_t consistentlyGlenn Kasten2012-01-261-2/+2
| |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I11de4e92254e128643d8f158c74dcfee97e51005
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Use audio_format_t consistently"Glenn Kasten2012-01-204-20/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Use audio_format_t consistentlyGlenn Kasten2012-01-124-20/+22
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Was int Change-Id: I8cc1beaa8006fb0a135cf1135955155090c8e87e
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Audio policy HAL set_ringer_mode is deprecated"Glenn Kasten2012-01-204-17/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Audio policy HAL set_ringer_mode is deprecatedGlenn Kasten2012-01-184-17/+2
| | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I66ef40ed381151ba61debe20edaa53bece0cc139
* | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typosGlenn Kasten2012-01-182-6/+7
|/ / / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie0acd07861604e66f571e0c1f43cfdccf12ea691
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge "audio policy manager: stream volume per device"Eric Laurent2012-01-174-50/+177
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | audio policy manager: stream volume per deviceEric Laurent2012-01-174-50/+177
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve volume management by keeping track of volume for each type of device independently. AudioPolicyManagerBase now keeps track of stream volumes for each device and apply volume according to current device selection. Methods to set and get stream volume now specify the device class. A value for "default" device is always present for each stream and is used if a device is selected and no specific volume was ever set for this device. Change-Id: I06d8f43aa151a09014f7e47e81304c73ff82e9f8
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Use audio_mode_t consistently"Glenn Kasten2012-01-172-4/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Use audio_mode_t consistentlyGlenn Kasten2012-01-122-4/+6
| |/ / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I62e23b81e3a411a0d9f012b363373d938827a2e4
* | | | | | | | | | | | | | | | | | | | | | | | | | Use audio_stream_type_t consistentlyGlenn Kasten2012-01-121-2/+2
|/ / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibeb4071cedb930c76dd62222b29844733bdc1548
* | | | | | | | | | | | | | | | | | | | | | | | | Fix monitor socket pollIrfan Sheriff2012-01-111-1/+1
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5534039 Change-Id: I28c41f896347963b0ded8415d1a51ff95cbf4b2d
* | | | | | | | | | | | | | | | | | | | | | | | Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGESteve Block2012-01-087-45/+45
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://android-git.corp.google.com/g/#/c/157220 Bug: 5449033 Change-Id: Idfcd2f2269080d92a621dc432c65f7cf244588af
* | | | | | | | | | | | | | | | | | | | | | | Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGESteve Block2012-01-054-47/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://android-git.corp.google.com/g/157065 Bug: 5449033 Change-Id: I86e4ce26d8fba68584d0a7fc17111b53c56d2932
* | | | | | | | | | | | | | | | | | | | | | | Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGESteve Block2012-01-041-5/+5
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://android-git.corp.google.com/g/156801 Bug: 5449033 Change-Id: I21aea046270c8700d349a4181c559d1b05333a1b
* | | | | | | | | | | | | | | | | | | | | | Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGESteve Block2012-01-034-12/+12
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://android-git.corp.google.com/g/156016 Bug: 5449033 Change-Id: I9dfdc3f00a5f4f5b6ef4c75280ce2594ab018577
* | | | | | | | | | | | | | | | | | | | | Add support for p2p socket communicationIrfan Sheriff2011-12-282-113/+137
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Right now, everything goes over the primary interface socket connection. Add support for a seperate connection over the p2p interface. Change-Id: I09118f88cfaa201b2d62d27add410cfd441d4454
* | | | | | | | | | | | | | | | | | | | am af9565aa: Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-090-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'af9565aa8be0136463ec549d9d3abdd906d2c390':
| * | | | | | | | | | | | | | | | | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-12-080-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | |/| / / / / / / / / / / / / / / / / / | | |/ / / / / / / / / / / / / / / / / Change-Id: Ifb9dad264079f0a566dd978dd56414fbaf59b9e0
* | | | | | | | | | | | | | | | | | | audio policy manager: remove ringer mode dumpEric Laurent2011-12-081-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ringer mode is at the moment not passed down from AudioService to AudioPolicyManager as it is currently not used in any routig decision. So the value store in audio policy manager is wrong and the dump is miss leading. Change-Id: I3c21c168393470fd64c1b73e3c511576a9acdd7e
* | | | | | | | | | | | | | | | | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-11-040-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | / / | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | Change-Id: I2b1dcb119df18200eebaef2f888df7aaaa150b34
| * | | | | | | | | | | | | | | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-020-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | / | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | am c16ac09f: Force camera shutter sound to speaker in Japan.Eric Laurent2011-11-022-12/+42
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c16ac09f510437e8340be691720177a490ae78f0': Force camera shutter sound to speaker in Japan.
| * | | | | | | | | | | | | | | | Force camera shutter sound to speaker in Japan.Eric Laurent2011-11-012-12/+42
| | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure that camera shutter sound is output to device speaker also while in call. Added a new strategy for enforced audible stream to address this case as the routing policy is now different from sonification strategy. Issue 5548406. Change-Id: I2de39dfaef7d90e3804b238b1379f0f59b75e985
* | | | | | | | | | | | | | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-10-310-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | Change-Id: Iadb285a24b3129b0dc2bd7089598a51d4af2eb6b
| * | | | | | | | | | | | | | merge in ics-release history after reset to masterThe Android Automerger2011-10-230-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | merge in ics-release history after reset to masterThe Android Automerger2011-10-190-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | merge in ics-release history after reset to masterThe Android Automerger2011-10-090-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | |
| | | | * | | | | | | | | | | merge in ics-release history after reset to masterThe Android Automerger2011-10-060-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|/ | | | | |/| | | | | | | | | |
| | | | | * | | | | | | | | | merge in ics-release history after reset to masterThe Android Automerger2011-09-280-0/+0
| | | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|_|_|/ | | | | | |/| | | | | | | | |
| | | | | | * | | | | | | | | merge in ics-release history after reset to masterThe Android Automerger2011-09-200-0/+0
| | | | | | |\ \ \ \ \ \ \ \ \ | | | | | | | |_|_|_|_|_|/ / / | | | | | | |/| | | | | | | |
| | | | | | | * | | | | | | | merge in ics-release history after reset to masterThe Android Automerger2011-09-130-0/+0
| | | | | | | |\ \ \ \ \ \ \ \ | | | | | | | | |_|_|_|_|/ / / | | | | | | | |/| | | | | | |
| | | | | | | | * | | | | | | merge in ics-release history after reset to masterThe Android Automerger2011-09-110-0/+0
| | | | | | | | |\ \ \ \ \ \ \ | | | | | | | | | |_|_|/ / / / | | | | | | | | |/| | | | | |
| | | | | | | | | * | | | | | merge in ics-release history after reset to masterThe Android Automerger2011-08-300-0/+0
| | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | |_|/ / / / | | | | | | | | | |/| | | | |
| | | | | | | | | | * | | | | merge in ics-release history after reset to masterThe Android Automerger2011-08-300-0/+0
| | | | | | | | | | |\ \ \ \ \ | | | | | | | | | | |/ / / / / | | | | | | | | | |/| / / / / | | | | | | | | | | |/ / / /
* | | | | | | | | | | | | | Rename LOGV(_IF) to ALOGV(_IF) DO NOT MERGESteve Block2011-10-256-110/+110
|/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://android-git.corp.google.com/g/#/c/143865 Bug: 5449033 Change-Id: I953e5eabaf5023a4dcd76339c336d9132f257f8c
* | | | | | | | | | | | | Fix music heard in speaker before notifications.Eric Laurent2011-10-201-1/+3
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increase the delay after muting music when switching audio path to both speaker and headset for notifications and ringtones. This is required to avoid a residual of music to be output to speaker now that the max latency has been increased in low power playback mode. This is a temporary workaround that will be removed when low power mode is controlled policy manager. Change-Id: If08e7f46e499be362badb2a24a79d1723ebfc00a
* | | | | | | | | | | | Fix issue 5440852: Youtube volume is too small ...Eric Laurent2011-10-182-29/+135
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When no DRC is applied by the platform when playing over the device speaker, faint audio signals are not boosted and barely audible until the media volume is raised to about one fourth of the range. Compensate this by applying a different volume curve for music stream when the speaker is selected. Change-Id: I03f316fb28150eda50b05dfa12310701e2674648
* | | | | | | | | | | Merge "wifi: Fix entropy file size"Dmitry Shmidt2011-10-061-4/+4
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | wifi: Fix entropy file sizeDmitry Shmidt2011-10-061-4/+4
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG: b/5321709 Change-Id: Iff4692f1f35b63136297261d1565bc16c854ede3 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | | | | | | | | | fix build: method needs to be pure virtual, otherwise needs to be defined.Olivier Bailly2011-10-051-1/+1
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9dbdd29dc430fbf19a1d9cb8d44a1f9c6f624dbb
* | | | | | | | | wifi: Change pipe to socket pair in termination of monitor thread codeDmitry Shmidt2011-09-271-20/+25
| |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id08c211102dabccff3e7d5a1373507f8d63ec70d Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | | | | | | | Reconcile with ics-factoryrom-releaseThe Android Open Source Project2011-09-220-0/+0
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | Change-Id: Ia48e10b311967e6df2d8619b973cab57a6933428
| * | | | | | | merge in ics-factoryrom-release history after reset to ics-factoryromThe Android Automerger2011-09-210-0/+0
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
* | | | | | | | Reconcile with ics-factoryrom-releaseThe Android Open Source Project2011-09-210-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| / / / / / / | |/ / / / / / Change-Id: Ie3d828b77b539c41d89b2a7e4057fea9e527dac8