OSDN Git Service
Eric Laurent [Tue, 1 Nov 2011 22:44:20 +0000 (22:44 +0000)]
am
c16ac09f: Force camera shutter sound to speaker in Japan.
* commit '
c16ac09f510437e8340be691720177a490ae78f0':
Force camera shutter sound to speaker in Japan.
Eric Laurent [Tue, 1 Nov 2011 20:54:26 +0000 (13:54 -0700)]
Force camera shutter sound to speaker in Japan.
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
Ed Heyl [Fri, 28 Oct 2011 19:05:54 +0000 (19:05 +0000)]
keep previous history after reset to mr1 plus aah changes (ics-aah-wip)
John Grossman [Mon, 29 Aug 2011 17:56:08 +0000 (10:56 -0700)]
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
John Grossman [Mon, 22 Aug 2011 20:25:06 +0000 (13:25 -0700)]
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
Ed Heyl [Wed, 26 Oct 2011 21:53:25 +0000 (21:53 +0000)]
undo reset to ics-mr1 until we have a better method
Ed Heyl [Wed, 26 Oct 2011 18:50:22 +0000 (18:50 +0000)]
reset to ics-mr1, but keep history
Steve Block [Wed, 26 Oct 2011 11:48:32 +0000 (04:48 -0700)]
am
6a70518b: (-s ours) Rename LOGV(_IF) to ALOGV(_IF) DO NOT MERGE
* commit '
6a70518b93928d1c91457ff805e375c82d76b0e5':
Rename LOGV(_IF) to ALOGV(_IF) DO NOT MERGE
Steve Block [Thu, 20 Oct 2011 10:56:19 +0000 (11:56 +0100)]
Rename LOGV(_IF) to ALOGV(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/#/c/143865
Bug:
5449033
Change-Id: I953e5eabaf5023a4dcd76339c336d9132f257f8c
Eric Laurent [Thu, 20 Oct 2011 17:56:04 +0000 (10:56 -0700)]
am
497fb456: Fix music heard in speaker before notifications.
* commit '
497fb4566204c88bd247aafc2412ddef8f85e480':
Fix music heard in speaker before notifications.
Eric Laurent [Thu, 20 Oct 2011 16:17:04 +0000 (09:17 -0700)]
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
Eric Laurent [Wed, 19 Oct 2011 02:33:39 +0000 (19:33 -0700)]
am
e43c5c4c: Fix issue
5440852: Youtube volume is too small ...
* commit '
e43c5c4ca4477a6b384711552c3e990609039d93':
Fix issue
5440852: Youtube volume is too small ...
Eric Laurent [Tue, 18 Oct 2011 21:03:28 +0000 (14:03 -0700)]
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
Dmitry Shmidt [Thu, 6 Oct 2011 22:18:23 +0000 (15:18 -0700)]
am
3a9b3983: Merge "wifi: Fix entropy file size"
* commit '
3a9b39837b4c13a6221d5d60ec0b7452ec4edf8a':
wifi: Fix entropy file size
Dmitry Shmidt [Thu, 6 Oct 2011 20:39:31 +0000 (13:39 -0700)]
Merge "wifi: Fix entropy file size"
Dmitry Shmidt [Thu, 6 Oct 2011 20:28:32 +0000 (13:28 -0700)]
wifi: Fix entropy file size
BUG: b/
5321709
Change-Id: Iff4692f1f35b63136297261d1565bc16c854ede3
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Olivier Bailly [Thu, 6 Oct 2011 01:37:36 +0000 (18:37 -0700)]
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.
Olivier Bailly [Thu, 6 Oct 2011 00:38:14 +0000 (17:38 -0700)]
fix build: method needs to be pure virtual, otherwise needs to be defined.
Change-Id: I9dbdd29dc430fbf19a1d9cb8d44a1f9c6f624dbb
Dmitry Shmidt [Wed, 28 Sep 2011 17:45:30 +0000 (10:45 -0700)]
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
Dmitry Shmidt [Wed, 28 Sep 2011 00:20:11 +0000 (17:20 -0700)]
wifi: Change pipe to socket pair in termination of monitor thread code
Change-Id: Id08c211102dabccff3e7d5a1373507f8d63ec70d
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
The Android Open Source Project [Thu, 22 Sep 2011 18:01:04 +0000 (11:01 -0700)]
am
62f7e7a0: Reconcile with ics-factoryrom-release
* commit '
62f7e7a017f59e7432672890d2fe8a7b3002fad0':
The Android Open Source Project [Thu, 22 Sep 2011 17:57:37 +0000 (10:57 -0700)]
Reconcile with ics-factoryrom-release
Change-Id: Ia48e10b311967e6df2d8619b973cab57a6933428
The Android Automerger [Wed, 21 Sep 2011 13:29:31 +0000 (06:29 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
The Android Open Source Project [Wed, 21 Sep 2011 13:23:15 +0000 (06:23 -0700)]
am
49de3df7: Reconcile with ics-factoryrom-release
* commit '
49de3df7d134adf1f53cd87c2e1317fcea8cdda1':
The Android Open Source Project [Wed, 21 Sep 2011 13:19:30 +0000 (06:19 -0700)]
Reconcile with ics-factoryrom-release
Change-Id: Ie3d828b77b539c41d89b2a7e4057fea9e527dac8
The Android Automerger [Wed, 21 Sep 2011 03:43:04 +0000 (20:43 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
Irfan Sheriff [Tue, 20 Sep 2011 21:13:06 +0000 (14:13 -0700)]
am
025321a0: Add support to terminate monitor thread
* commit '
025321a09dbe7820870125acf771e1da02684605':
Add support to terminate monitor thread
Irfan Sheriff [Mon, 19 Sep 2011 22:03:45 +0000 (15:03 -0700)]
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
Eric Laurent [Tue, 13 Sep 2011 00:04:11 +0000 (17:04 -0700)]
am
cd057ad2: Issue
5256795: Phone ringtone volume is too low
* commit '
cd057ad2774903c62f5c11bc71c4e7357aee71b8':
Issue
5256795: Phone ringtone volume is too low
Eric Laurent [Mon, 12 Sep 2011 18:38:12 +0000 (11:38 -0700)]
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
Eric Laurent [Mon, 12 Sep 2011 20:43:27 +0000 (13:43 -0700)]
am
fd6aba42: Merge "audio policy manager: invert SPDIF/HDMI priority"
* commit '
fd6aba424765b2856c0b78135ce15d1bd7508948':
audio policy manager: invert SPDIF/HDMI priority
Eric Laurent [Mon, 12 Sep 2011 20:42:00 +0000 (13:42 -0700)]
Merge "audio policy manager: invert SPDIF/HDMI priority"
Eric Laurent [Fri, 9 Sep 2011 23:04:01 +0000 (16:04 -0700)]
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
Erik Gilling [Fri, 9 Sep 2011 21:06:32 +0000 (14:06 -0700)]
am
020418ec: uevent: add helper to get uevent FD
* commit '
020418ec646f989ca14f26e3abd8f23208e9cd4d':
uevent: add helper to get uevent FD
Erik Gilling [Thu, 8 Sep 2011 23:30:33 +0000 (16:30 -0700)]
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>
John Grossman [Mon, 29 Aug 2011 17:56:08 +0000 (10:56 -0700)]
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
Irfan Sheriff [Mon, 29 Aug 2011 23:32:52 +0000 (16:32 -0700)]
am
67ba2276: Add support seperate p2p config file
* commit '
67ba2276b9a5232685e14d416fea0b1250515594':
Add support seperate p2p config file
John Grossman [Mon, 22 Aug 2011 20:25:06 +0000 (13:25 -0700)]
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
Irfan Sheriff [Fri, 26 Aug 2011 21:39:38 +0000 (14:39 -0700)]
Add support seperate p2p config file
Also, fixed a bug with config overwrite with ctrl_interface update
Bug:
5002384
Change-Id: I870c12ee58d60f696512c27deb4b9d35b4dc3b2a
Dmitry Shmidt [Tue, 23 Aug 2011 22:44:23 +0000 (15:44 -0700)]
wifi: Increase wait for card removal
Change-Id: Ia9f5bf2a905c89126535a6c01c3af67189df6c32
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Irfan Sheriff [Mon, 22 Aug 2011 20:27:56 +0000 (13:27 -0700)]
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
Dmitry Shmidt [Fri, 12 Aug 2011 21:05:23 +0000 (14:05 -0700)]
Merge "wifi: Wait for sdio card removal"
Dmitry Shmidt [Fri, 12 Aug 2011 19:14:15 +0000 (12:14 -0700)]
wifi: Wait for sdio card removal
Change-Id: I3fdbd27e45536b9142e0ca88692270bac543177a
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Eric Laurent [Thu, 11 Aug 2011 03:16:23 +0000 (20:16 -0700)]
AudioPolicyManager: register effect CPU on enable
Audio effect CPU usage is now registered on enable and
unregistered on disable instead of when the effect is
created or destroyed.
Change-Id: Icffcede9558d8d41887278f0efef2df430927381
Vladimir Chtchetkine [Wed, 10 Aug 2011 19:25:01 +0000 (12:25 -0700)]
am
f5498f29: am
058c940a: Merge "Enable QEMUD pipe connection for all legacy hw-control clients"
* commit '
f5498f29d81f638e4d833d0399f80f379e721fbe':
Enable QEMUD pipe connection for all legacy hw-control clients
Vladimir Chtchetkine [Tue, 9 Aug 2011 17:05:30 +0000 (10:05 -0700)]
am
058c940a: Merge "Enable QEMUD pipe connection for all legacy hw-control clients"
* commit '
058c940a88c1a28818daaed32fe86dfdc61929b6':
Enable QEMUD pipe connection for all legacy hw-control clients
Vladimir Chtchetkine [Mon, 8 Aug 2011 19:59:34 +0000 (12:59 -0700)]
Merge "Enable QEMUD pipe connection for all legacy hw-control clients"
Vladimir Chtchetkine [Thu, 4 Aug 2011 20:57:57 +0000 (13:57 -0700)]
Enable QEMUD pipe connection for all legacy hw-control clients
Change-Id: Ic713d4cdcddb724958fc8c1c8a82a1dc2733da32
Jean-Michel Trivi [Tue, 26 Jul 2011 16:27:24 +0000 (09:27 -0700)]
Merge "Fix bug
4319552 Use commonly defined channel mask values"
Jean-Michel Trivi [Tue, 26 Jul 2011 00:00:17 +0000 (17:00 -0700)]
Fix bug
4319552 Use commonly defined channel mask values
Use channel mask values that match OpenSL ES and other common APIs.
Change-Id: Ie7e62bf8e3565f4e4b1f17b6e525c490989c8d6c
Jean-Michel Trivi [Mon, 25 Jul 2011 23:59:36 +0000 (16:59 -0700)]
Merge "Fix bug
4211099 channel constants and 7.1 mask"
Jean-Michel Trivi [Mon, 25 Jul 2011 18:22:44 +0000 (11:22 -0700)]
Fix bug
4211099 channel constants and 7.1 mask
Add definitions for the side and elevated channels.
Correct definition of 7.1 mask which uses
the side channels rather than the front half-pan channels.
Change-Id: I8b75c6fb380fddc2db09fab53799850218940c93
Dmitry Shmidt [Mon, 25 Jul 2011 21:45:28 +0000 (14:45 -0700)]
Merge "wifi: Add entropy file support"
Dmitry Shmidt [Mon, 25 Jul 2011 17:46:00 +0000 (10:46 -0700)]
wifi: Add entropy file support
Change-Id: Iee92ee9fee15037cffde86b9cd2c9407afb8d2ca
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Dmitry Shmidt [Sun, 24 Jul 2011 23:52:26 +0000 (16:52 -0700)]
Merge "Fix incremental builds by adding Cleanspec step"
Dmitry Shmidt [Fri, 22 Jul 2011 23:23:43 +0000 (16:23 -0700)]
Fix incremental builds by adding Cleanspec step
Change-Id: Ifb18c40c43668e985c56492956ceeff2e49e4c38
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Eric Laurent [Thu, 21 Jul 2011 00:45:18 +0000 (17:45 -0700)]
Merge "Audio effects: support for audio pre processing"
Dmitry Shmidt [Tue, 19 Jul 2011 22:59:13 +0000 (15:59 -0700)]
wifi: Add wifi_change_fw_path()
Change-Id: I1c4afe43457a295c0ffe0a865c6c331109dce614
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Eric Laurent [Sat, 18 Jun 2011 04:51:11 +0000 (21:51 -0700)]
Audio effects: support for audio pre processing
Audio policy manager: allow registration of audio effects on
inputs too.
Change-Id: I92efa5b51cfde591052a5c56ba2b0b84de80df0f
Jeff Brown [Tue, 12 Jul 2011 19:15:49 +0000 (12:15 -0700)]
Merge "Remove the simulator target from all makefiles. Bug:
5010576"
Jeff Brown [Tue, 12 Jul 2011 05:12:24 +0000 (22:12 -0700)]
Remove the simulator target from all makefiles.
Bug:
5010576
Change-Id: I77e0620f7543926b5def7666c02d99565f6487ed
Eric Laurent [Fri, 17 Jun 2011 23:21:11 +0000 (16:21 -0700)]
Audio HAL: added interface for audio preprocessing
Change-Id: I0a84ddbff53f13662873f69d9be4dfa13ebcb8fe
Dmitry Shmidt [Fri, 8 Jul 2011 23:51:48 +0000 (16:51 -0700)]
Fix incremental builds by adding Cleanspec step
Change-Id: Ia51da716a6d5ede2ea802881e77cb69d3e6a3ed6
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Dmitry Shmidt [Fri, 1 Jul 2011 18:03:43 +0000 (11:03 -0700)]
wifi: Add wifi_get_fw_path() call
Change-Id: Ib9dc8ce84febb2fba045ee527838653d0d1ad11b
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Dmitry Shmidt [Wed, 29 Jun 2011 23:22:28 +0000 (16:22 -0700)]
wifi: Assume built-in wlan driver if WIFI_DRIVER_MODULE_PATH is not set
Change-Id: Ic63381fe037cd5aa1f3d419d7c253c2b17961a24
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Dima Zavin [Tue, 14 Jun 2011 01:18:55 +0000 (18:18 -0700)]
audio: update for audio/audio_policy header names/locations
Change-Id: I7a414a2e173c2bfd72ae70d57b251fa0d4dbdfa0
Signed-off-by: Dima Zavin <dima@android.com>
Dmitry Shmidt [Mon, 13 Jun 2011 17:32:08 +0000 (10:32 -0700)]
wifi: Allow to finish interface down
Change-Id: I249646845f0837c7cbf6c118d08aecb5b3ccaba5
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Dima Zavin [Wed, 11 May 2011 21:16:14 +0000 (14:16 -0700)]
update for new audio.h header location
Change-Id: Ia0859cc22cfd50a334235aac5b1e8688bc3d52f4
Signed-off-by: Dima Zavin <dima@android.com>
Dima Zavin [Wed, 27 Apr 2011 02:51:06 +0000 (19:51 -0700)]
hardware_legacy/audio: provide a default audio policy implementation
This uses the legacy policy code to build a default implementation that
can be used while we figure out what the new policy inheritance should
look like.
Change-Id: I3e4154abc7152b4f560b28e391a268bf508767e3
Signed-off-by: Dima Zavin <dima@android.com>
Dima Zavin [Tue, 19 Apr 2011 23:15:44 +0000 (16:15 -0700)]
legacy: build legacy audio wrapper libs
Note that the legacy audio helper libs are not part of the
main libhardware_legacy lib itself.
Change-Id: Ie08343ab8de2d298db0041c711d7e02a284bc4c3
Signed-off-by: Dima Zavin <dima@android.com>
Dima Zavin [Tue, 19 Apr 2011 23:53:42 +0000 (16:53 -0700)]
hardware_legacy: provide HAL helpers for legacy audio users
This doesn't actually create a HAL, but rather a set of helper static
libraries that device specific libraries (i.e. the old libaudio pieces)
can link against to create a proper audio HAL module.
We provide an audio_policy static wrapper and audio hardware interface
static wrapper.
Change-Id: Ie56195447ad24b83888f752dca24674b0afd8a76
Signed-off-by: Dima Zavin <dima@android.com>
Dima Zavin [Tue, 19 Apr 2011 23:33:12 +0000 (16:33 -0700)]
legacy: move legacy audio code from frameworks/base here
Change-Id: Ic5da0130af44354dffdf85c30cd99f57c6ee163c
Signed-off-by: Dima Zavin <dima@android.com>
Dima Zavin [Tue, 19 Apr 2011 23:09:19 +0000 (16:09 -0700)]
legacy: explicitly enumerate subdirs to include
Change-Id: I308d26d5f018eb4fb62a06eef6e6320b0d5aa7dc
Signed-off-by: Dima Zavin <dima@android.com>
Dima Zavin [Sat, 16 Apr 2011 02:37:35 +0000 (19:37 -0700)]
legacy: also build a shared version of libpower
Change-Id: Ied33d3d8cdb17444d5ea367422b060490985e2b8
Signed-off-by: Dima Zavin <dima@android.com>
Dima Zavin [Sat, 16 Apr 2011 02:36:35 +0000 (19:36 -0700)]
legacy: don't link against libutils or libbinder
Change-Id: Ia8cd74ad9d7c6170fb0525b77e1443b7a8d39377
Signed-off-by: Dima Zavin <dima@android.com>
Dmitry Shmidt [Fri, 25 Mar 2011 20:37:18 +0000 (13:37 -0700)]
Move wpa_ctrl_cleanup() function to wifi_wpa_ctrl_cleanup()
Change-Id: I557a2ac10ebb226508ffccfbfeca7f326912ed04
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Eric Laurent [Wed, 16 Mar 2011 06:54:38 +0000 (23:54 -0700)]
am
37757062: Improvement for issue
3489986: BT SCO volume
* commit '
3775706211178bf0d252fd30b9ff1c00926c8535':
Improvement for issue
3489986: BT SCO volume
Eric Laurent [Tue, 15 Mar 2011 21:33:07 +0000 (14:33 -0700)]
Improvement for issue
3489986: BT SCO volume
Add a parameter to applyStreamVolumes() to force stream volume update.
Change-Id: I3cc82e516bb7c76c28c2470b06711c44f4789ce5
Dmitry Shmidt [Mon, 7 Mar 2011 23:30:53 +0000 (15:30 -0800)]
wifi: Ensure RW for wpa_supplicant.conf
Change-Id: Icaeac0ee2239333be5f3be10024824ada6da18d5
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Glenn Kasten [Thu, 10 Feb 2011 21:31:26 +0000 (13:31 -0800)]
Bug
3352047 Wrong message when adjusting volume
Add hidden AudioManager.getDevicesForStream and output device codes.
Change-Id: I45be59a2774196a135d013e45f38033036f74257
Eric Laurent [Fri, 4 Feb 2011 01:18:49 +0000 (17:18 -0800)]
Eric Laurent [Thu, 3 Feb 2011 18:28:26 +0000 (10:28 -0800)]
Eric Laurent [Wed, 2 Feb 2011 20:10:13 +0000 (12:10 -0800)]
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
The Android Open Source Project [Sun, 30 Jan 2011 20:54:43 +0000 (12:54 -0800)]
am
5fc112b6: Reconcile gingerbread-plus-aosp and honeycomb
* commit '
5fc112b62e2cebc22c473ef33641457bada72545':
The Android Open Source Project [Sun, 30 Jan 2011 20:40:56 +0000 (12:40 -0800)]
Reconcile gingerbread-plus-aosp and honeycomb
Change-Id: I96877f8a87a34abdd40914563726e25ea4edfe8e
The Android Open Source Project [Sun, 30 Jan 2011 20:40:56 +0000 (12:40 -0800)]
Mass merge from gingerbread - do not merge
Change-Id: I25c47b6206b96cad0eea664ad766e4be29bcf539
Jean-Michel Trivi [Sat, 29 Jan 2011 17:54:43 +0000 (09:54 -0800)]
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
Jean-Michel Trivi [Wed, 26 Jan 2011 22:17:33 +0000 (14:17 -0800)]
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
Jean-Michel Trivi [Wed, 26 Jan 2011 22:15:05 +0000 (14:15 -0800)]
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
Jean-Michel Trivi [Wed, 26 Jan 2011 22:05:25 +0000 (14:05 -0800)]
am
17f1ff8c: do not merge bug
3370834 Cherrypick from master CL 79894
* commit '
17f1ff8c99dada2cca93f68d434cf64a6dc692c2':
do not merge bug
3370834 Cherrypick from master CL 79894
Jean-Michel Trivi [Tue, 25 Jan 2011 00:05:03 +0000 (16:05 -0800)]
Bug
3376700 Update APM header for volume initialization and computation
Change-Id: I7cb31c9ecd3c347bfa72cad5a331500a20fdcfbe
Jean-Michel Trivi [Tue, 16 Nov 2010 00:02:06 +0000 (16:02 -0800)]
do not merge bug
3370834 Cherrypick from master CL 79894
Support new audio mode for audio communication other than telephony.
Change-Id: I4fa2c277517111e8490f6bdfb97ce3788dc8f549
Eric Laurent [Wed, 19 Jan 2011 03:11:00 +0000 (19:11 -0800)]
Tentative fix for issue
3362362.
Added an initCheck() method to AudioPolicyInterface to verify
successful initialization of AudioPolicyManager.
Change-Id: I4c892282dbeb3246ee6c006bd206a3e723bcb71f
Dmitry Shmidt [Wed, 5 Jan 2011 00:35:18 +0000 (16:35 -0800)]
wifi: Update wpa_supplicant.conf interface in case of mismatch
Change-Id: Iea7432bd96df2c1474e5af1788225322c9b78307
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Irfan Sheriff [Fri, 17 Dec 2010 00:17:29 +0000 (16:17 -0800)]
rewrite wpa_supplicant.conf when it is too small
Bug:
2850497
Change-Id: Ifce2055212f78519f2cac8f73ee86b0b7a9ee0ee
Brian Swetland [Sat, 4 Dec 2010 04:51:49 +0000 (20:51 -0800)]
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
Eric Laurent [Thu, 2 Dec 2010 00:30:46 +0000 (16:30 -0800)]
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.
Eric Laurent [Thu, 2 Dec 2010 00:06:35 +0000 (16:06 -0800)]
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.
Eric Laurent [Wed, 1 Dec 2010 22:15:21 +0000 (14:15 -0800)]
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
Eric Laurent [Wed, 1 Dec 2010 20:15:23 +0000 (12:15 -0800)]