Commit graph

301 commits

Author SHA1 Message Date
Ed Heyl
a3bfd5452e keep previous history after reset to mr1 plus aah changes (ics-aah-wip) 2011-10-28 19:05:54 +00:00
John Grossman
5b71e6fd76 Add an implementation of get_next_write_timestamp.
Add a default implementation of get_next_write_timestamp to the C <--> C++
legacy audio HAL implementation allowing HALs using the legacy C++
AudioStreamOut to overload and implement get_next_write_timestamp.  Default
implementation returns INVALID_OPERATION to indicate that the functionality is
not supported.

Change-Id: I087347649e9ba186a74cb34aaadf989bf90720fe
2011-10-27 17:35:47 -04:00
John Grossman
617c80a82e Add a bridge implementation of get_master_volume.
Add an implementation of the new get_master_volume method to bridge from the new
C only audio HAL to the old C++ legacy audio HAL.

Change-Id: I5c29814623b5141b0c69927ea60be9873c8a5dab
2011-10-27 17:35:43 -04:00
Ed Heyl
31690823b7 undo reset to ics-mr1 until we have a better method 2011-10-26 21:53:25 +00:00
Ed Heyl
839fa265f8 reset to ics-mr1, but keep history 2011-10-26 18:50:22 +00:00
Steve Block
ddf2483a19 am 6a70518b: (-s ours) Rename LOGV(_IF) to ALOGV(_IF) DO NOT MERGE
* commit '6a70518b93928d1c91457ff805e375c82d76b0e5':
  Rename LOGV(_IF) to ALOGV(_IF)  DO NOT MERGE
2011-10-26 04:48:32 -07:00
Steve Block
6a70518b93 Rename LOGV(_IF) to ALOGV(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/#/c/143865

Bug: 5449033
Change-Id: I953e5eabaf5023a4dcd76339c336d9132f257f8c
2011-10-25 18:16:13 +01:00
The Android Automerger
a5952d80bb merge in ics-release history after reset to master 2011-10-23 07:01:23 -07:00
Eric Laurent
8450f2e096 am 497fb456: Fix music heard in speaker before notifications.
* commit '497fb4566204c88bd247aafc2412ddef8f85e480':
  Fix music heard in speaker before notifications.
2011-10-20 10:56:04 -07:00
Eric Laurent
497fb45662 Fix music heard in speaker before notifications.
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
2011-10-20 09:17:04 -07:00
The Android Automerger
4b6258f26a merge in ics-release history after reset to master 2011-10-19 07:44:52 -07:00
Eric Laurent
0781f0851f am e43c5c4c: Fix issue 5440852: Youtube volume is too small ...
* commit 'e43c5c4ca4477a6b384711552c3e990609039d93':
  Fix issue 5440852: Youtube volume is too small ...
2011-10-18 19:33:39 -07:00
Eric Laurent
e43c5c4ca4 Fix issue 5440852: Youtube volume is too small ...
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
2011-10-18 18:29:26 -07:00
The Android Automerger
55304ad4e8 merge in ics-release history after reset to master 2011-10-09 07:00:41 -07:00
Dmitry Shmidt
63e6d195a4 am 3a9b3983: Merge "wifi: Fix entropy file size"
* commit '3a9b39837b4c13a6221d5d60ec0b7452ec4edf8a':
  wifi: Fix entropy file size
2011-10-06 15:18:23 -07:00
Dmitry Shmidt
3a9b39837b Merge "wifi: Fix entropy file size" 2011-10-06 13:39:31 -07:00
Dmitry Shmidt
07a629e27c wifi: Fix entropy file size
BUG: b/5321709

Change-Id: Iff4692f1f35b63136297261d1565bc16c854ede3
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2011-10-06 13:28:59 -07:00
The Android Automerger
14b8bc143d merge in ics-release history after reset to master 2011-10-06 07:00:45 -07:00
Olivier Bailly
4db599c289 am b7ee3930: fix build: method needs to be pure virtual, otherwise needs to be defined.
* commit 'b7ee39305b9b651dff8c2e5737feb5f9ae1136c9':
  fix build: method needs to be pure virtual, otherwise needs to be defined.
2011-10-05 18:37:36 -07:00
Olivier Bailly
b7ee39305b fix build: method needs to be pure virtual, otherwise needs to be defined.
Change-Id: I9dbdd29dc430fbf19a1d9cb8d44a1f9c6f624dbb
2011-10-05 18:02:02 -07:00
The Android Automerger
fe081127d1 merge in ics-release history after reset to master 2011-09-28 17:57:56 -07:00
Dmitry Shmidt
5ab8a1017a am 45bf8a6f: wifi: Change pipe to socket pair in termination of monitor thread code
* commit '45bf8a6f0bbf148ca5a1a626ab1c5c38a0855e13':
  wifi: Change pipe to socket pair in termination of monitor thread code
2011-09-28 10:45:30 -07:00
Dmitry Shmidt
45bf8a6f0b wifi: Change pipe to socket pair in termination of monitor thread code
Change-Id: Id08c211102dabccff3e7d5a1373507f8d63ec70d
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2011-09-27 17:35:20 -07:00
The Android Open Source Project
9222c77e43 am 62f7e7a0: Reconcile with ics-factoryrom-release
* commit '62f7e7a017f59e7432672890d2fe8a7b3002fad0':
2011-09-22 11:01:04 -07:00
The Android Open Source Project
62f7e7a017 Reconcile with ics-factoryrom-release
Change-Id: Ia48e10b311967e6df2d8619b973cab57a6933428
2011-09-22 10:57:37 -07:00
The Android Automerger
b220dd4fd7 merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-09-21 06:29:31 -07:00
The Android Open Source Project
b86597475d am 49de3df7: Reconcile with ics-factoryrom-release
* commit '49de3df7d134adf1f53cd87c2e1317fcea8cdda1':
2011-09-21 06:23:15 -07:00
The Android Open Source Project
49de3df7d1 Reconcile with ics-factoryrom-release
Change-Id: Ie3d828b77b539c41d89b2a7e4057fea9e527dac8
2011-09-21 06:19:30 -07:00
The Android Automerger
c37aad22a0 merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-09-20 20:43:04 -07:00
Irfan Sheriff
0ba5253e28 am 025321a0: Add support to terminate monitor thread
* commit '025321a09dbe7820870125acf771e1da02684605':
  Add support to terminate monitor thread
2011-09-20 14:13:06 -07:00
The Android Automerger
262cb50463 merge in ics-release history after reset to master 2011-09-20 07:00:24 -07:00
Irfan Sheriff
025321a09d Add support to terminate monitor thread
Create a local pipe to track when socket connection times out
and send a terminate on the monitor thread

Bug: 5337272
Change-Id: I80ed3f8450b4d54d1b9e2bbc3cc84f10d0ae7a04
2011-09-19 16:52:32 -07:00
The Android Automerger
9e0d7cd89d merge in ics-release history after reset to master 2011-09-13 06:34:14 -07:00
Eric Laurent
f19b955727 am cd057ad2: Issue 5256795: Phone ringtone volume is too low
* commit 'cd057ad2774903c62f5c11bc71c4e7357aee71b8':
  Issue 5256795: Phone ringtone volume is too low
2011-09-12 17:04:11 -07:00
Eric Laurent
cd057ad277 Issue 5256795: Phone ringtone volume is too low
Modified the volume curve for ringtones and notifications
in audio policy manager. The first volume step now corresponds to
-30dB instead of -50dB thus making ringtone much more
audible for low volume settings.

Also made a generic implementation of volume curves according to
audio policy strategies.

Change-Id: Ieb7916ba2e53c2a10a47efec82814cabed21c48b
2011-09-12 17:01:15 -07:00
Eric Laurent
c1f5f18328 am fd6aba42: Merge "audio policy manager: invert SPDIF/HDMI priority"
* commit 'fd6aba424765b2856c0b78135ce15d1bd7508948':
  audio policy manager: invert SPDIF/HDMI priority
2011-09-12 13:43:27 -07:00
Eric Laurent
fd6aba4247 Merge "audio policy manager: invert SPDIF/HDMI priority" 2011-09-12 13:42:00 -07:00
Eric Laurent
55ac23bc11 audio policy manager: invert SPDIF/HDMI priority
Route media audio in priority to S/PDIF output when available
even if HDMI is connected. This allows users to chose to output audio
to a different system than the display.

Also force media volume to max when playing over S/PDIF.

Change-Id: I03b82a7235cb60f2b5d6cf7923570554b07ac400
2011-09-12 12:40:35 -07:00
The Android Automerger
4fda210bbb merge in ics-release history after reset to master 2011-09-11 06:41:55 -07:00
Erik Gilling
cbff628806 am 020418ec: uevent: add helper to get uevent FD
* commit '020418ec646f989ca14f26e3abd8f23208e9cd4d':
  uevent: add helper to get uevent FD
2011-09-09 14:06:32 -07:00
Erik Gilling
020418ec64 uevent: add helper to get uevent FD
This allows users of the library to handle thier own poll loop.

Change-Id: Id3fe2be442c0ca29c74253f9f36e9377278780e4
Signed-off-by: Erik Gilling <konkers@android.com>
2011-09-08 16:30:33 -07:00
John Grossman
e14fb4f6fb Add an implementation of get_next_write_timestamp.
Add a default implementation of get_next_write_timestamp to the C <--> C++
legacy audio HAL implementation allowing HALs using the legacy C++
AudioStreamOut to overload and implement get_next_write_timestamp.  Default
implementation returns INVALID_OPERATION to indicate that the functionality is
not supported.

Change-Id: I2f32858197696cb46ba6b96f30acc08e0b737a3f
2011-08-31 11:49:34 -07:00
The Android Automerger
512e0e89c9 merge in ics-release history after reset to master 2011-08-30 13:42:49 -07:00
The Android Automerger
2f3aa31fa2 merge in ics-release history after reset to master 2011-08-30 12:45:42 -07:00
Irfan Sheriff
a6fa57f7ef am 67ba2276: Add support seperate p2p config file
* commit '67ba2276b9a5232685e14d416fea0b1250515594':
  Add support seperate p2p config file
2011-08-29 16:32:52 -07:00
John Grossman
5be2265e30 Add a bridge implementation of get_master_volume.
Add an implementation of the new get_master_volume method to bridge from the new
C only audio HAL to the old C++ legacy audio HAL.

Change-Id: Ib66bdcd3bee50949047e7ad51388e15491a71724
2011-08-26 16:54:09 -07:00
Irfan Sheriff
67ba2276b9 Add support seperate p2p config file
Also, fixed a bug with config overwrite with ctrl_interface update

Bug: 5002384
Change-Id: I870c12ee58d60f696512c27deb4b9d35b4dc3b2a
2011-08-26 14:39:38 -07:00
Dmitry Shmidt
953c114065 wifi: Increase wait for card removal
Change-Id: Ia9f5bf2a905c89126535a6c01c3af67189df6c32
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2011-08-23 15:44:23 -07:00
Irfan Sheriff
5a8a2d2b13 Fix system property race at supplicant stop
We stop supplicant by sending a "terminate" control command. init then
updates the system property init.svc.wpa_supplicant when the supplicant has stopped. The
framework gets notified of a successful supplicant stop through a supplicant event.

It can happen that the framework has been notified of a supplicant stop, but the init
process has not set the system property and thus when the framework tries to connect
to the supplicant again, it can immediately return saying the supplicant is already running.

Avoid this race, by ensuring the call from framework to close supplicant connection polls
for the update by init process that the system property indicates supplicant has stopped.

Bug: 5166494
Change-Id: Ie74a8cf39fa56ae557ea6bbbcba7865301620c42
2011-08-22 13:35:48 -07:00
Dmitry Shmidt
841667015b Merge "wifi: Wait for sdio card removal" 2011-08-12 14:05:23 -07:00