summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * Use accessor to read property serial numbersColin Cross2013-06-171-2/+2
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | Hide the implementation of the property structures by using an accessor. (cherry picked from commit 14c02f245e56687b765487d25a034d71196d33b6) Change-Id: Id86ff99d8430fa73bbc745aaa0ff2b7713ca7885
* | | Use accessor to read property serial numbersColin Cross2013-06-141-2/+2
| | | | | | | | | | | | | | | | | | | | | Hide the implementation of the property structures by using an accessor. Change-Id: Ic604935882f6085e3d082baa651bad9bafe0a54a
* | | wifi: Move common file from wpa_supplicant_libDmitry Shmidt2013-06-061-0/+197
| | | | | | | | | | | | | | | Change-Id: I902f864da4317fd637fbc31036133c49a8ae0724 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | | wifi: Skip adding interface prefix if existsDmitry Shmidt2013-06-061-6/+8
| | | | | | | | | | | | | | | | | | | | | Bug: 9313188 Change-Id: I63784493c84ac4ffcc9810a7798b1c0de1b0f68b Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | | wifi: Use global control socketDmitry Shmidt2013-06-031-16/+46
| | | | | | | | | | | | | | | Change-Id: I11e4438ec0b36575e1b5a563ac4da57303d028c7 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | | wifi: Add command buffer length parameter to wifi_command()Dmitry Shmidt2013-05-302-3/+6
| | | | | | | | | | | | | | | Change-Id: I832bc51279e0fb7d3002298f87a35b816b666ad5 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | | wifi: Use wpa_ctrl_cleanup() function from wpa_supplicantDmitry Shmidt2013-05-222-44/+2
| | | | | | | | | | | | | | | Change-Id: I24af9ec380e138f24864cd9359c6901b8b29e5ee Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | | am 66707435: audio policy: fix device selection in startInput()Eric Laurent2013-05-211-0/+4
|\ \ \ | |/ / | | | | | | | | | * commit '66707435156d8d99d795271a7bd54943065b4c2d': audio policy: fix device selection in startInput()
| * | audio policy: fix device selection in startInput()Eric Laurent2013-05-171-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check again input device selection when capture starts in case conditions have changed since the input stream was opened. This is related to but does not fix issue 8761558. It makes the selection of BT SCO device consistent. Bug: 8761558 Change-Id: I386b638e9c3238711e16fb848449af561624359e
* | | am a776ffd2: Rewrite an invalid config fileIrfan Sheriff2013-04-121-26/+35
|\ \ \ | |/ / | | | | | | | | | * commit 'a776ffd243bbd02948ebefd43f4ac2690ebb11e6': Rewrite an invalid config file
| * | Rewrite an invalid config fileIrfan Sheriff2013-04-121-26/+35
| | | | | | | | | | | | | | | | | | | | | | | | We saw a case of config file being corrupted. Add a mechanism to recover from this when wifi is toggled off and on. Bug: 8569820 Change-Id: If2baceb065838d2adb5cde61772d25a05455fc90
* | | am e5d72df1: Add liblogYing Wang2013-04-092-2/+3
|\ \ \ | |/ / | | | | | | | | | * commit 'e5d72df1f1107653627674347475c7cbcc4bf8ba': Add liblog
| * | Add liblogYing Wang2013-04-092-2/+3
| | | | | | | | | | | | | | | Bug: 8580410 Change-Id: Ib86983540b34e8c9083979fdd21a17715ec53f80
* | | am 5a950c96: audio policy: reuse direct output when possibleEric Laurent2013-04-042-11/+37
|\ \ \ | |/ / | | | | | | | | | * commit '5a950c960cd40648cc3ab8defe817f88e0a7ecf4': audio policy: reuse direct output when possible
| * | audio policy: reuse direct output when possibleEric Laurent2013-04-042-11/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modified getOutput() logic to not systematically open a new direct output when a profile matches a request. This causes a problem when transitioning between two multichannel tracks as the audio HAL will most of the times only support one direct output stream open at a time. Instead, reuse an open output if all the parameters match or force close the output before reopening it. Also modify releaseOuput(): - close a direct output only if no client is using it anymore - call closeOutput() instead of removing the output from the open output list: this factors in code executed when closing an output stream. Bug 8388941 Change-Id: Ic3d3beb21063622ddf57a5b932f93d56f2986f54
* | | am 80f5b040: audio policy: fix music glitch when starting callEric Laurent2013-03-262-72/+76
|\ \ \ | |/ / | | | | | | | | | * commit '80f5b0400f86d49e70aa1a793b34f34492f005bc': audio policy: fix music glitch when starting call
| * | audio policy: fix music glitch when starting callEric Laurent2013-03-252-72/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When answering a call in silent mode, music playing over A2DP was not immediately muted by current audio policy manager logic. The fix consists in muting media strategy on all output streams immediately when entering in call. Also add methods to AudioOutputDescriptor to report recent global, per strategy and per stream activity. Bug 8315512 Change-Id: I4a90eb05db50e4f22374d02b1e647e8662f6bec6
* | | am 58d6b9eb: (-s ours) am 10f06dc0: am 0b904fda: am 93bb0058: am 4bcc1fdb: ↵Jean-Baptiste Queru2013-03-110-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | (-s ours) am b25a2fcf: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '58d6b9eb20a9805ea7cecff1df01259e8a2ce1d4':
| * | am 10f06dc0: am 0b904fda: am 93bb0058: am 4bcc1fdb: (-s ours) am b25a2fcf: ↵Jean-Baptiste Queru2013-03-110-0/+0
| |\ \ |/ / / | | | | | | | | | | | | (-s ours) Reconcile with jb-mr1-release - do not merge * commit '10f06dc0787c20d9ffab07e59654322b9348c056':
| * | am 0b904fda: am 93bb0058: am 4bcc1fdb: (-s ours) am b25a2fcf: (-s ours) ↵Jean-Baptiste Queru2013-03-110-0/+0
| |\ \ | | |/ | |/| | | | | | | | | | Reconcile with jb-mr1-release - do not merge * commit '0b904fdaa636372e9173f1fb4a5dae5c382aabb8':
| | * am 93bb0058: am 4bcc1fdb: (-s ours) am b25a2fcf: (-s ours) Reconcile with ↵Jean-Baptiste Queru2013-03-110-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | jb-mr1-release - do not merge * commit '93bb0058bd3e5c0703797289f88a033789249766':
| | | * am 4bcc1fdb: (-s ours) am b25a2fcf: (-s ours) Reconcile with jb-mr1-release ↵Jean-Baptiste Queru2013-03-110-0/+0
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | - do not merge * commit '4bcc1fdb8ef242e6f8fe55181e16c18c5cd220ad':
| | | | * am b25a2fcf: (-s ours) Reconcile with jb-mr1-release - do not mergeJean-Baptiste Queru2013-03-110-0/+0
| | | | |\ | | | |/ / | | | | | | | | | | * commit 'b25a2fcfae02ff802b81978ec82f0da8d2735d77':
| | | | * Reconcile with jb-mr1-release - do not mergeJean-Baptiste Queru2013-03-110-0/+0
| | | | |\
* | | | | | audio policy: fix in call capture deviceEric Laurent2013-03-051-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow use of default capture device when AUDIO_SOURCE_VOICE_UPLINK is specified and the platform does not support AUDIO_DEVICE_IN_VOICE_CALL. Change-Id: Ibbc314f60c91e5a0fa75d57878f2d2a96ef2d83b
* | | | | | audio policy: fix music glitch with touch soundsEric Laurent2013-03-041-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is a brief music interruption when a touch sound is played the first time after the headset insertion. This is due to a bug in audio policy manager logic to prevent volume bursts while changing device while music is playing. The fix consists in muting music only on current output stream when changing device, not all output streams. Also prevent unecessary device change if the requested device is not supported by the output stream profile. Bug: 8301565 Change-Id: I00daab19bbdda10ca856a05fa32a1e333e1b9469
* | | | | | wifi: Remove obsolete variablesDmitry Shmidt2013-02-271-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4759c26bf59f593650374ae4b205e8a1f83a8d68 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | | | | | Merge "audio policy: fix in call audio setup delay"Eric Laurent2013-02-111-5/+5
|\ \ \ \ \ \
| * | | | | | audio policy: fix in call audio setup delayEric Laurent2013-02-111-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is a delay inserted by audio policy manager before switching device when entering in call mode to allow music playback to be muted before the device actually switches. This delay can be significant when high latency outputs (e.g. deep buffers) are present and should not be applied if the output is not active. Issue 7612431. Change-Id: I04b666769033dbfdc861752b030d3f7bdffe9435
* | | | | | | Identify remote stream activity, used for notification routingJean-Michel Trivi2013-02-114-2/+39
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for checking remote stream activity. Don't route notifications like media when media active remotely. Add remote stream activity query in audio policy HAL. Bug 7485803 Change-Id: Ifb722c7f9ffbfbdc877fec5156bcfc09bec40651
* | | | | | audio policy: added front + back micEric Laurent2013-01-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added definition to parse front + back mic from input descriptors in audio_policy.conf file. Change-Id: I9ebdeac664e12104589a52d15acbbfc4db787923
* | | | | | am 8d674a4b: (-s ours) am 85f8faa6: am a7c17deb: audio policy: notification ↵Eric Laurent2012-11-080-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | delay - DO NOT MERGE * commit '8d674a4b6f4300df90415889c2f57fe8b383e867': audio policy: notification delay - DO NOT MERGE
| * | | | | am 85f8faa6: am a7c17deb: audio policy: notification delay - DO NOT MERGEEric Laurent2012-11-082-3/+17
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '85f8faa65754011161f40b2047fa19a6128ba88c': audio policy: notification delay - DO NOT MERGE
| | * | | | am a7c17deb: audio policy: notification delay - DO NOT MERGEEric Laurent2012-11-082-3/+17
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | * commit 'a7c17deb32fe28230b77b0dff17bb113088a5c16': audio policy: notification delay - DO NOT MERGE
| | | * | | audio policy: notification delay - DO NOT MERGEEric Laurent2012-11-082-3/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge from master: "audio policy: fix notification start delay The mechanism delaying notifications in case of muliple active outputs with long latencies must take into account recently paused audio tracks. Bug 7400428." Change-Id: I4ac9dfac81336e33f475b4f28df82713707d0c46
* | | | | | am 2fbecbad: (-s ours) am 8d8ad2ec: am fe43d163: audio policy: fix volume ↵Eric Laurent2012-11-080-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | problem - DO NOT MERGE * commit '2fbecbad88f0c6298c35a5bc1bf87aa244059754': audio policy: fix volume problem - DO NOT MERGE
| * | | | | am 8d8ad2ec: am fe43d163: audio policy: fix volume problem - DO NOT MERGEEric Laurent2012-11-081-1/+4
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '8d8ad2ec94dfab5555dbac71c8d5fe8d1cde0cea': audio policy: fix volume problem - DO NOT MERGE
| | * | | | am fe43d163: audio policy: fix volume problem - DO NOT MERGEEric Laurent2012-11-081-1/+4
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | * commit 'fe43d163d6646a175934f0752fa05e3e53e89da4': audio policy: fix volume problem - DO NOT MERGE
| | | * | | audio policy: fix volume problem - DO NOT MERGEEric Laurent2012-11-081-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge from master: "audio policy: fix volume change when disabling SCO commit 76e97d39 introduced a regression by having setDeviceConnectionState() force a device change on duplicated outputs even if the selected device is 0. This also forces a device 0 for the two outputs it is duplicated to, which may override a valid device selection on those outputs and apply default volumes. Bug 7429869." Change-Id: I37dd66343c54eb27e420089edbda04444fa1e2c6
* | | | | | am 8254f4b2: (-s ours) am 503d13af: am da06cb61: audio policy: fix dynamic ↵John Grossman2012-11-080-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | parameter - DO NOT MERGE * commit '8254f4b244a1f5d65054831d2b0afe53c67c3898': audio policy: fix dynamic parameter - DO NOT MERGE
| * | | | | am 503d13af: am da06cb61: audio policy: fix dynamic parameter - DO NOT MERGEJohn Grossman2012-11-080-0/+0
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '503d13af915529f78312c6cd3fc951923c45f4f2': audio policy: fix dynamic parameter - DO NOT MERGE
| | * | | | am da06cb61: audio policy: fix dynamic parameter - DO NOT MERGEJohn Grossman2012-11-080-0/+0
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | * commit 'da06cb6142faa3e09cbf7226ca9c75e45661095b': audio policy: fix dynamic parameter - DO NOT MERGE
| | | * | | audio policy: fix dynamic parameter - DO NOT MERGEJohn Grossman2012-11-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge from master: "Fix a parse error in checkOutputForDevice Fix a small parsing error in parsing the supported formats and sample rates of a stream out with dynamic values for these parameters. The channel mask parser was properly skipping the "=" in the setting string, but formats and sample rates were not (cauing the first reported format and sample rate to end up being skipped)" Change-Id: Id227a44f6b5fc0c223f2ce74f94ebb6abc5fa77d Signed-off-by: John Grossman <johngro@google.com>
* | | | | | am 81e6a2e0: (-s ours) am 77514217: am e912bfd7: audio policy: direct output ↵Jason Simmons2012-11-080-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix - DO NOT MERGE * commit '81e6a2e099546f4580253d2b0262d43f2a4090aa': audio policy: direct output fix - DO NOT MERGE
| * | | | | am 77514217: am e912bfd7: audio policy: direct output fix - DO NOT MERGEJason Simmons2012-11-080-0/+0
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '77514217215c1b7872ece94dc9d3ceef62cdefbb': audio policy: direct output fix - DO NOT MERGE
| | * | | | am e912bfd7: audio policy: direct output fix - DO NOT MERGEJason Simmons2012-11-080-0/+0
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | * commit 'e912bfd79880ea5faac0fbcdb4e696125e151e18': audio policy: direct output fix - DO NOT MERGE
| | | * | | audio policy: direct output fix - DO NOT MERGEJason Simmons2012-11-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge "Close a newly opened direct output if its parameters are invalid" from master Change-Id: I27ac015217480a854d25273ab9498949971b411a
* | | | | | Merge "audio policy: fix notification start delay"Eric Laurent2012-11-082-3/+17
|\ \ \ \ \ \
| * | | | | | audio policy: fix notification start delayEric Laurent2012-11-072-3/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The mechanism delaying notifications in case of muliple active outputs with long latencies must take into account recently paused audio tracks. Bug 7400428. Change-Id: I4ac9dfac81336e33f475b4f28df82713707d0c46
* | | | | | | am b1e73538: am 7fcf81e3: am 745e7fd4: Fix stop supplicant apiIrfan Sheriff2012-11-082-2/+11
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | * commit 'b1e73538da3e719f404ca014c48fd8dddf81c141': Fix stop supplicant api