Commit graph

169 commits

Author SHA1 Message Date
Dima Zavin
1d10e7d480 legacy: don't link against libutils or libbinder
Change-Id: Ia8cd74ad9d7c6170fb0525b77e1443b7a8d39377
Signed-off-by: Dima Zavin <dima@android.com>
2011-04-20 14:42:38 -07:00
Dmitry Shmidt
eea19f1d85 Move wpa_ctrl_cleanup() function to wifi_wpa_ctrl_cleanup()
Change-Id: I557a2ac10ebb226508ffccfbfeca7f326912ed04
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2011-03-25 13:37:18 -07:00
Eric Laurent
770062f225 am 37757062: Improvement for issue 3489986: BT SCO volume
* commit '3775706211178bf0d252fd30b9ff1c00926c8535':
  Improvement for issue 3489986: BT SCO volume
2011-03-15 23:54:38 -07:00
Eric Laurent
3775706211 Improvement for issue 3489986: BT SCO volume
Add a parameter to applyStreamVolumes() to force stream volume update.

Change-Id: I3cc82e516bb7c76c28c2470b06711c44f4789ce5
2011-03-15 14:33:07 -07:00
Dmitry Shmidt
89ae703cd6 wifi: Ensure RW for wpa_supplicant.conf
Change-Id: Icaeac0ee2239333be5f3be10024824ada6da18d5
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2011-03-07 15:30:53 -08:00
Glenn Kasten
fafb18fb31 Bug 3352047 Wrong message when adjusting volume
Add hidden AudioManager.getDevicesForStream and output device codes.

Change-Id: I45be59a2774196a135d013e45f38033036f74257
2011-02-10 13:31:26 -08:00
Eric Laurent
793dd9f2be am 01056fcf: am 36291a74: Fix issue 3371080.
* commit '01056fcfbbbb577f7d70324a4d6a3a211a519951':
  Fix issue 3371080.
2011-02-03 17:18:49 -08:00
Eric Laurent
01056fcfbb am 36291a74: Fix issue 3371080.
* commit '36291a74cd212c4172ac054ad0eec686b7e15c96':
  Fix issue 3371080.
2011-02-03 10:28:26 -08:00
Eric Laurent
36291a74cd Fix issue 3371080.
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
2011-02-02 15:33:42 -08:00
The Android Open Source Project
b6bb4031b5 am 5fc112b6: Reconcile gingerbread-plus-aosp and honeycomb
* commit '5fc112b62e2cebc22c473ef33641457bada72545':
2011-01-30 12:54:43 -08:00
The Android Open Source Project
5fc112b62e Reconcile gingerbread-plus-aosp and honeycomb
Change-Id: I96877f8a87a34abdd40914563726e25ea4edfe8e
2011-01-30 12:40:56 -08:00
The Android Open Source Project
c3045e4626 Mass merge from gingerbread - do not merge
Change-Id: I25c47b6206b96cad0eea664ad766e4be29bcf539
2011-01-30 12:40:56 -08:00
Jean-Michel Trivi
691f9e583e am 17f1ff8c: (-s ours) do not merge bug 3370834 Cherrypick from master CL 79894
* commit '17f1ff8c99dada2cca93f68d434cf64a6dc692c2':
  do not merge bug 3370834 Cherrypick from master CL 79894
2011-01-29 09:54:43 -08:00
Jean-Michel Trivi
986cd9a001 am c6ba82b5: (-s ours) am ef6b8ea3: (-s ours) am 17f1ff8c: do not merge bug 3370834 Cherrypick from master CL 79894
* commit 'c6ba82b58e7a7207f19190a8b814ce8a131c109e':
  do not merge bug 3370834 Cherrypick from master CL 79894
2011-01-26 14:17:33 -08:00
Jean-Michel Trivi
c6ba82b58e am ef6b8ea3: (-s ours) am 17f1ff8c: do not merge bug 3370834 Cherrypick from master CL 79894
* commit 'ef6b8ea3f664254958491f48fbe38c502d1129df':
  do not merge bug 3370834 Cherrypick from master CL 79894
2011-01-26 14:15:05 -08:00
Jean-Michel Trivi
ef6b8ea3f6 am 17f1ff8c: do not merge bug 3370834 Cherrypick from master CL 79894
* commit '17f1ff8c99dada2cca93f68d434cf64a6dc692c2':
  do not merge bug 3370834 Cherrypick from master CL 79894
2011-01-26 14:05:25 -08:00
Jean-Michel Trivi
f2faac71fd Bug 3376700 Update APM header for volume initialization and computation
Change-Id: I7cb31c9ecd3c347bfa72cad5a331500a20fdcfbe
2011-01-25 09:35:39 -08:00
Jean-Michel Trivi
17f1ff8c99 do not merge bug 3370834 Cherrypick from master CL 79894
Support new audio mode for audio communication other than telephony.

Change-Id: I4fa2c277517111e8490f6bdfb97ce3788dc8f549
2011-01-20 12:01:22 -08:00
Eric Laurent
61f3579486 Tentative fix for issue 3362362.
Added an initCheck() method to AudioPolicyInterface to verify
successful initialization of AudioPolicyManager.

Change-Id: I4c892282dbeb3246ee6c006bd206a3e723bcb71f
2011-01-19 08:49:30 -08:00
Dmitry Shmidt
0e9f488e67 wifi: Update wpa_supplicant.conf interface in case of mismatch
Change-Id: Iea7432bd96df2c1474e5af1788225322c9b78307
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2011-01-05 11:32:03 -08:00
Irfan Sheriff
8a5b197b3d rewrite wpa_supplicant.conf when it is too small
Bug: 2850497
Change-Id: Ifce2055212f78519f2cac8f73ee86b0b7a9ee0ee
2010-12-17 09:39:05 -08:00
Brian Swetland
e686393f88 do not actually error out when there's no kernel power interface
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
2010-12-03 20:51:49 -08:00
Eric Laurent
6b42202515 am 14e36261: am 831ad524: Fix issue 2641884: Bluetooth volume is dependent on in call volume.
* commit '14e362617ceb67f1ae3dd09e0f7744860b5ee066':
  Fix issue 2641884: Bluetooth volume is dependent on in call volume.
2010-12-01 16:30:46 -08:00
Eric Laurent
14e362617c am 831ad524: Fix issue 2641884: Bluetooth volume is dependent on in call volume.
* commit '831ad5246fcfcd3c91e02c079a0aee997c895ddf':
  Fix issue 2641884: Bluetooth volume is dependent on in call volume.
2010-12-01 16:06:35 -08:00
Eric Laurent
831ad5246f Fix issue 2641884: Bluetooth volume is dependent on in call volume.
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
2010-12-01 14:17:05 -08:00
Eric Laurent
f9e188482f am 3cb64cb8: am 2f2db765: Fix issue 3142808.
* commit '3cb64cb8bbda335affcb3c71fce3c4f908a97111':
  Fix issue 3142808.
2010-12-01 12:15:23 -08:00
Eric Laurent
3cb64cb8bb am 2f2db765: Fix issue 3142808.
* commit '2f2db765228f110b37a2851d1199d3c72d313c6d':
  Fix issue 3142808.
2010-12-01 11:28:56 -08:00
Jean-Michel Trivi
3e480fa067 Support new audio mode for audio communication other than telephony.
Change-Id: I965cbeee67f72e31240e3e8cd2630bf22a03b9ea
2010-11-15 16:45:36 -08:00
Dianne Hackborn
7314fe03b6 Add an API to find out whether there is a vibrator.
Change-Id: Ic0d967bc72c542fc6a97331c9197114f3f571c08
2010-11-04 12:05:45 -07:00
Eric Laurent
2f2db76522 Fix issue 3142808.
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
2010-11-02 18:18:13 -07:00
Erik Gilling
1cb1728b18 add native uevent handling
Change-Id: I2315f5638668ab802a4b3c723afd97b7edf0c695
2010-10-20 16:07:57 -07:00
Dmitry Shmidt
8fb5f74df7 wifi: Remove unnecessary delay after loading the driver
Change-Id: I371d262a5bf5da989c0c7beabb9fcb8d440375e4
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2010-09-14 15:11:22 -07:00
Chih-Wei Huang
a738e38d44 am c875bb38: am 709a302e: wifi: pass interface to wpa_supplicant
Merge commit 'c875bb384f1c17aa198262acd72b18825f7d8152'

* commit 'c875bb384f1c17aa198262acd72b18825f7d8152':
  wifi: pass interface to wpa_supplicant
2010-09-09 15:53:02 -07:00
Chih-Wei Huang
c875bb384f am 709a302e: wifi: pass interface to wpa_supplicant
Merge commit '709a302e77c44a3e3ee8359be3f2c9361f05d02c' into gingerbread-plus-aosp

* commit '709a302e77c44a3e3ee8359be3f2c9361f05d02c':
  wifi: pass interface to wpa_supplicant
2010-09-09 15:19:56 -07:00
Chih-Wei Huang
709a302e77 wifi: pass interface to wpa_supplicant
Change-Id: I577d0e7a0c6cbf7c1ddb025c01519a30bb7997b3
2010-09-03 11:28:57 +08:00
Eric Laurent
7a25fd7138 am bab20b67: am d6e68c3a: Fix issue 2952766.
Merge commit 'bab20b6759d9f0445e4ff5f27f0a3666f0efafa5'

* commit 'bab20b6759d9f0445e4ff5f27f0a3666f0efafa5':
  Fix issue 2952766.
2010-08-30 15:07:42 -07:00
Eric Laurent
bab20b6759 am d6e68c3a: Fix issue 2952766.
Merge commit 'd6e68c3ae5677bc6127628d1c700b11c8f0fcdaf' into gingerbread-plus-aosp

* commit 'd6e68c3ae5677bc6127628d1c700b11c8f0fcdaf':
  Fix issue 2952766.
2010-08-30 15:04:31 -07:00
Eric Laurent
d6e68c3ae5 Fix issue 2952766.
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
2010-08-27 17:16:29 -07:00
Jean-Baptiste Queru
6e21ee7a3c am 548af739: (-s ours) Revert "remove libnetutils dependency"
Merge commit '548af73955b14f6615d4ca8b637ecfa3929abd06'

* commit '548af73955b14f6615d4ca8b637ecfa3929abd06':
  Revert "remove libnetutils dependency"
2010-08-18 13:31:43 -07:00
Jean-Baptiste Queru
548af73955 Revert "remove libnetutils dependency"
This reverts commit 7c6051a499.
2010-08-18 11:16:25 -07:00
Dmitry Shmidt
24bf7fc4e0 Fix wpa_supplicant.conf permissions (0660)
Change-Id: I62e6711f706af88d4447f2885f7a0ce3f30a8a2e
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2010-08-09 11:23:45 -07:00
Irfan Sheriff
2bb990bfd2 Add is_wifi_driver_loaded
Change-Id: I73600a11891b1380d8bc1bfbc24494410a989fcb
2010-07-27 12:17:08 -07:00
Eric Laurent
3be78bce2b resolved conflicts for merge of 930fe98b to master
Change-Id: Ib6ab3b02aede7e07b71e19b16d305919be849bdd
2010-07-20 12:23:58 -07:00
Eric Laurent
930fe98bbe am d2b227e7: Audio policy manager changes for audio effects
Merge commit 'd2b227e76033d8c44b71d2982028a63436d3fe84' into gingerbread-plus-aosp

* commit 'd2b227e76033d8c44b71d2982028a63436d3fe84':
  Audio policy manager changes for audio effects
2010-07-20 11:28:23 -07:00
Eric Laurent
d2b227e760 Audio policy manager changes for audio effects
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
2010-07-20 09:31:47 -07:00
Mike Lockwood
7fbf4515ec am 7cc17d54: am 0df071ad: Remove obsolete gpstest app.
Merge commit '7cc17d5435eae10b87d56e8b58665c976c81751b'

* commit '7cc17d5435eae10b87d56e8b58665c976c81751b':
  Remove obsolete gpstest app.
2010-07-01 11:55:51 -07:00
Mike Lockwood
7cc17d5435 am 0df071ad: Remove obsolete gpstest app.
Merge commit '0df071ad05d1c1dae6b6aaa6122146fa679c7a12' into gingerbread-plus-aosp

* commit '0df071ad05d1c1dae6b6aaa6122146fa679c7a12':
  Remove obsolete gpstest app.
2010-07-01 06:39:52 -07:00
Mike Lockwood
0df071ad05 Remove obsolete gpstest app.
Change-Id: If4456b47aa4af6d50110773c87fb67efa985ece9
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-07-01 09:37:08 -04:00
Jean-Baptiste Queru
445591dded Undo previous merge
Change-Id: I74fd5ae2634b0c7909b7ab332d174f98a9c8aee5
2010-06-21 13:15:01 -07:00
The Android Open Source Project
b33a811e81 am 44c99ec7: merge from froyo-plus-aosp
Merge commit '44c99ec7cf4c78731d129d5657560dc555b24d50'

* commit '44c99ec7cf4c78731d129d5657560dc555b24d50':
  remove libnetutils dependency
2010-06-21 11:17:34 -07:00