summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | Fix issue 3371080.Eric Laurent2011-02-022-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move isStreamActive() method from AudioFlinger to AudioPolicyManager. iStreamActive() now specifies a time window during which the stream is considered active after it actually stopped. Change-Id: Ib0d7d8f061b9f809d307ecfac40960ef582e5f0f
* | | | am 5fc112b6: Reconcile gingerbread-plus-aosp and honeycombThe Android Open Source Project2011-01-300-0/+0
|\ \ \ \ | |/ / / | | | | | | | | * commit '5fc112b62e2cebc22c473ef33641457bada72545':
| * | | Reconcile gingerbread-plus-aosp and honeycombThe Android Open Source Project2011-01-300-0/+0
| |\ \ \ | | |/ / | | | | | | | | Change-Id: I96877f8a87a34abdd40914563726e25ea4edfe8e
| | * | Mass merge from gingerbread - do not mergeThe Android Open Source Project2011-01-300-0/+0
| | |\ \ | | | | | | | | | | | | | | | Change-Id: I25c47b6206b96cad0eea664ad766e4be29bcf539
| | | * \ am 17f1ff8c: (-s ours) do not merge bug 3370834 Cherrypick from master CL 79894Jean-Michel Trivi2011-01-290-0/+0
| | | |\ \ | | |/ / / | | | | | | | | | | | | | | | * commit '17f1ff8c99dada2cca93f68d434cf64a6dc692c2': do not merge bug 3370834 Cherrypick from master CL 79894
* | | | | am c6ba82b5: (-s ours) am ef6b8ea3: (-s ours) am 17f1ff8c: do not merge bug ↵Jean-Michel Trivi2011-01-260-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | 3370834 Cherrypick from master CL 79894 * commit 'c6ba82b58e7a7207f19190a8b814ce8a131c109e': do not merge bug 3370834 Cherrypick from master CL 79894
| * | | | am ef6b8ea3: (-s ours) am 17f1ff8c: do not merge bug 3370834 Cherrypick from ↵Jean-Michel Trivi2011-01-260-0/+0
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/| | | | | | | | | master CL 79894 * commit 'ef6b8ea3f664254958491f48fbe38c502d1129df': do not merge bug 3370834 Cherrypick from master CL 79894
| | * | am 17f1ff8c: do not merge bug 3370834 Cherrypick from master CL 79894Jean-Michel Trivi2011-01-262-8/+18
| | |\ \ | | | |/ | | | | | | | | | | | | * commit '17f1ff8c99dada2cca93f68d434cf64a6dc692c2': do not merge bug 3370834 Cherrypick from master CL 79894
| | | * do not merge bug 3370834 Cherrypick from master CL 79894Jean-Michel Trivi2011-01-202-8/+18
| | | | | | | | | | | | | | | | | | | | | | | | Support new audio mode for audio communication other than telephony. Change-Id: I4fa2c277517111e8490f6bdfb97ce3788dc8f549
* | | | Bug 3376700 Update APM header for volume initialization and computationJean-Michel Trivi2011-01-251-0/+16
|/ / / | | | | | | | | | Change-Id: I7cb31c9ecd3c347bfa72cad5a331500a20fdcfbe
* | | Tentative fix for issue 3362362.Eric Laurent2011-01-192-1/+3
| | | | | | | | | | | | | | | | | | | | | Added an initCheck() method to AudioPolicyInterface to verify successful initialization of AudioPolicyManager. Change-Id: I4c892282dbeb3246ee6c006bd206a3e723bcb71f
* | | wifi: Update wpa_supplicant.conf interface in case of mismatchDmitry Shmidt2011-01-051-11/+54
| | | | | | | | | | | | | | | Change-Id: Iea7432bd96df2c1474e5af1788225322c9b78307 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | | rewrite wpa_supplicant.conf when it is too smallIrfan Sheriff2010-12-171-1/+5
| | | | | | | | | | | | | | | Bug: 2850497 Change-Id: Ifce2055212f78519f2cac8f73ee86b0b7a9ee0ee
* | | do not actually error out when there's no kernel power interfaceBrian Swetland2010-12-031-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | This allows the system to work on hardware that doesn't have PM support (board bringup, etc) but has no ill effects on production hardware. Change-Id: I4e40ac92c6b4d08f2044224f80382934061ccc06
* | | am 14e36261: am 831ad524: Fix issue 2641884: Bluetooth volume is dependent ↵Eric Laurent2010-12-010-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | on in call volume. * commit '14e362617ceb67f1ae3dd09e0f7744860b5ee066': Fix issue 2641884: Bluetooth volume is dependent on in call volume.
| * | am 831ad524: Fix issue 2641884: Bluetooth volume is dependent on in call volume.Eric Laurent2010-12-011-0/+1
| |\ \ | | |/ | | | | | | | | | * commit '831ad5246fcfcd3c91e02c079a0aee997c895ddf': Fix issue 2641884: Bluetooth volume is dependent on in call volume.
| | * Fix issue 2641884: Bluetooth volume is dependent on in call volume.Eric Laurent2010-12-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem is that the code in AudioPolicyManagerBase::checkAndSetVolume() that forces voice volume to max when setting bluetooth SCO volume is not called if the bluetooth stream volume did not actually change. So even if we re apply volumes when switching to bluetooth device, the voice volume is not changed in audio HAL and remains what it was when routed to earpiece. What makes things worse on Passion is that stream volumes are limited when connected to bluetooth and their actual value does not change as soon as they exceed the limit threshold. Change-Id: Ieb72a71e06e9b3079cc8bc76c78ce83e060a2ea2
* | | am 3cb64cb8: am 2f2db765: Fix issue 3142808.Eric Laurent2010-12-011-1/+3
|\ \ \ | |/ / | | | | | | | | | * commit '3cb64cb8bbda335affcb3c71fce3c4f908a97111': Fix issue 3142808.
| * | am 2f2db765: Fix issue 3142808.Eric Laurent2010-12-011-1/+3
| |\ \ | | |/ | | | | | | | | | * commit '2f2db765228f110b37a2851d1199d3c72d313c6d': Fix issue 3142808.
| | * Fix issue 3142808.Eric Laurent2010-11-021-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is a bug in the way audio policy manager handles A2DP interface suspend/restore when SCO is used. This bug is not new but has been triggered by a change in the timing of the events received by audio policy manager when a call is setup and torn down introduced by commit 164a8f86c7e48992691368c4895709c3bdb835a4. The fix consists in grouping the control of A2DP suspended state in a single function that is called systematically when conditions affecting this state are changed: - call state change - device connection/disconnection - change in forced usage. Change-Id: Ib76a999513b5afbfd59ba945f8650d2a48d6f480
* | | Support new audio mode for audio communication other than telephony.Jean-Michel Trivi2010-11-152-8/+18
| | | | | | | | | | | | Change-Id: I965cbeee67f72e31240e3e8cd2630bf22a03b9ea
* | | Add an API to find out whether there is a vibrator.Dianne Hackborn2010-11-042-0/+24
| | | | | | | | | | | | Change-Id: Ic0d967bc72c542fc6a97331c9197114f3f571c08
* | | add native uevent handlingErik Gilling2010-10-202-0/+56
| | | | | | | | | | | | Change-Id: I2315f5638668ab802a4b3c723afd97b7edf0c695
* | | wifi: Remove unnecessary delay after loading the driverDmitry Shmidt2010-09-141-1/+1
| | | | | | | | | | | | | | | Change-Id: I371d262a5bf5da989c0c7beabb9fcb8d440375e4 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | | am c875bb38: am 709a302e: wifi: pass interface to wpa_supplicantChih-Wei Huang2010-09-091-3/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit 'c875bb384f1c17aa198262acd72b18825f7d8152' * commit 'c875bb384f1c17aa198262acd72b18825f7d8152': wifi: pass interface to wpa_supplicant
| * | am 709a302e: wifi: pass interface to wpa_supplicantChih-Wei Huang2010-09-091-3/+4
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '709a302e77c44a3e3ee8359be3f2c9361f05d02c' into gingerbread-plus-aosp * commit '709a302e77c44a3e3ee8359be3f2c9361f05d02c': wifi: pass interface to wpa_supplicant
| | * | wifi: pass interface to wpa_supplicantChih-Wei Huang2010-09-031-3/+4
| | | | | | | | | | | | | | | | Change-Id: I577d0e7a0c6cbf7c1ddb025c01519a30bb7997b3
* | | | am bab20b67: am d6e68c3a: Fix issue 2952766.Eric Laurent2010-08-301-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit 'bab20b6759d9f0445e4ff5f27f0a3666f0efafa5' * commit 'bab20b6759d9f0445e4ff5f27f0a3666f0efafa5': Fix issue 2952766.
| * | | am d6e68c3a: Fix issue 2952766.Eric Laurent2010-08-301-2/+2
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | Merge commit 'd6e68c3ae5677bc6127628d1c700b11c8f0fcdaf' into gingerbread-plus-aosp * commit 'd6e68c3ae5677bc6127628d1c700b11c8f0fcdaf': Fix issue 2952766.
| | * | Fix issue 2952766.Eric Laurent2010-08-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fix for issue 2952766 showed some unused code in AudioPolicyManagerBase::checkOutputForStrategy(): since commit eb8f850d0b7e53956e917fd9645f808c1a09bc88: there is no need to update the hardware output device as it will be updated when the new tracks are created by audioflinger. Change-Id: I2f46fab58a5db3b4cd03fdaeebd7d6603c8dbbdd
* | | | am 548af739: (-s ours) Revert "remove libnetutils dependency"Jean-Baptiste Queru2010-08-180-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '548af73955b14f6615d4ca8b637ecfa3929abd06' * commit '548af73955b14f6615d4ca8b637ecfa3929abd06': Revert "remove libnetutils dependency"
| * | | Revert "remove libnetutils dependency"Jean-Baptiste Queru2010-08-182-0/+29
| | | | | | | | | | | | | | | | This reverts commit 7c6051a4990d9c55245c90a233bb23e5cc5cb544.
* | | | Fix wpa_supplicant.conf permissions (0660)Dmitry Shmidt2010-08-091-1/+9
| | | | | | | | | | | | | | | | | | | | Change-Id: I62e6711f706af88d4447f2885f7a0ce3f30a8a2e Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | | | Add is_wifi_driver_loadedIrfan Sheriff2010-07-272-3/+11
| | | | | | | | | | | | | | | | Change-Id: I73600a11891b1380d8bc1bfbc24494410a989fcb
* | | | resolved conflicts for merge of 930fe98b to masterEric Laurent2010-07-202-9/+71
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: Ib6ab3b02aede7e07b71e19b16d305919be849bdd
| * | | am d2b227e7: Audio policy manager changes for audio effectsEric Laurent2010-07-202-9/+70
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit 'd2b227e76033d8c44b71d2982028a63436d3fe84' into gingerbread-plus-aosp * commit 'd2b227e76033d8c44b71d2982028a63436d3fe84': Audio policy manager changes for audio effects
| | * | Audio policy manager changes for audio effectsEric Laurent2010-07-202-9/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added methods for audio effects management by audio policy manager. - control of total CPU load and memory used by effect engines - selection of output stream for global effects - added audio session id in parameter list for startOutput() and stopOutput(). this is not used in default audio policy manager implementation. Change-Id: I3467e64035387cc5272266b1318a5ed788958374
* | | | am 7cc17d54: am 0df071ad: Remove obsolete gpstest app.Mike Lockwood2010-07-012-163/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '7cc17d5435eae10b87d56e8b58665c976c81751b' * commit '7cc17d5435eae10b87d56e8b58665c976c81751b': Remove obsolete gpstest app.
| * | | am 0df071ad: Remove obsolete gpstest app.Mike Lockwood2010-07-012-163/+0
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit '0df071ad05d1c1dae6b6aaa6122146fa679c7a12' into gingerbread-plus-aosp * commit '0df071ad05d1c1dae6b6aaa6122146fa679c7a12': Remove obsolete gpstest app.
| | * | Remove obsolete gpstest app.Mike Lockwood2010-07-012-163/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: If4456b47aa4af6d50110773c87fb67efa985ece9 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | Undo previous mergeJean-Baptiste Queru2010-06-212-0/+29
| | | | | | | | | | | | | | | | Change-Id: I74fd5ae2634b0c7909b7ab332d174f98a9c8aee5
* | | | am 44c99ec7: merge from froyo-plus-aospThe Android Open Source Project2010-06-212-29/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '44c99ec7cf4c78731d129d5657560dc555b24d50' * commit '44c99ec7cf4c78731d129d5657560dc555b24d50': remove libnetutils dependency
| * | | merge from froyo-plus-aospThe Android Open Source Project2010-06-212-29/+0
| |\ \ \ | | |/ / | |/| / | | |/ Change-Id: I5fa7394d50dcc53441de332ba778902a08230882
| | * merge from open-source masterThe Android Open Source Project2010-06-152-29/+0
| | |\ | | | | | | | | | | | | Change-Id: Iff5f59c3bf645911730bfa7defee848e5b54a4a1
| | | * remove libnetutils dependencySzymon Jakubczak2010-06-092-29/+0
| | | | | | | | | | | | | | | | Change-Id: I2b10ec7b9c8392bf9e64153406264a56b0ecbe30
* | | | Fix issue 2641884: Bluetooth volume is dependent on in call volume.Eric Laurent2010-05-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem is that the code in AudioPolicyManagerBase::checkAndSetVolume() that forces voice volume to max when setting bluetooth SCO volume is not called if the bluetooth stream volume did not actually change. So even if we re apply volumes when switching to bluetooth device, the voice volume is not changed in audio HAL and remains what it was when routed to earpiece. What makes things worse on Passion is that stream volumes are limited when connected to bluetooth and their actual value does not change as soon as they exceed the limit threshold. Change-Id: Ic6c54b4a7fd54983f445de9a9b5cd2ea0025155c
* | | | am c6cf19a6: Get rid of warnings when compiled with -Wformat-securityNick Kralevich2010-05-141-3/+6
|\ \ \ \ | |/ / /
| * | | Get rid of warnings when compiled with -Wformat-securityNick Kralevich2010-05-131-3/+6
| | | | | | | | | | | | | | | | Change-Id: Ib0a56e508734b1eca8b6cf125fd07efefee854aa
* | | | am bf871a3e: am 28739a81: merge from open-source masterThe Android Open Source Project2010-04-080-0/+0
|\ \ \ \ | |/ / /
| * | | am 28739a81: merge from open-source masterThe Android Open Source Project2010-04-080-0/+0
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit '28739a81dbdeb046adc9e31ffadbe65cb45563b3' into kraken * commit '28739a81dbdeb046adc9e31ffadbe65cb45563b3': Add a static library containing power.c for use by the librpc library.