OSDN Git Service
Eric Laurent [Thu, 7 Jun 2012 16:10:26 +0000 (09:10 -0700)]
Merge "audio policy: fix notification volume limitation" into jb-dev
Eric Laurent [Thu, 7 Jun 2012 00:39:16 +0000 (17:39 -0700)]
audio policy: fix notification volume limitation
The limitation of notification volume when playing music over headphones
has been broken for devices where notifications and music are played over
separate output streams.
Fix computeVolume() to check music stream activity on all outputs.
Bug
6623707.
Change-Id: Ie25f9b428ea086efe0be5fea2d31551d2528b655
Eric Laurent [Wed, 6 Jun 2012 23:09:03 +0000 (16:09 -0700)]
audio policy: remove delay when enabling speaker
Do not force mute on a strategy when moving it from one output
stream to another if no stream is active.
Bug
6611972.
Change-Id: I21f72b0ef3600639de66e6b0a1c3ae44045fd81f
Eric Laurent [Tue, 1 May 2012 01:28:24 +0000 (18:28 -0700)]
audio policy: improve support for direct outputs
Add the capability to query supported parameters for
direct outputs after a device is connected. This allows
to dynamically update the output profile for devices like
HDMI where the capabilities depend on the connected sink.
Also added very verbose log mode for volume and mute.
Change-Id: I1d4ba8e7dbc3e1af883582857ce93240441e551c
Marco Nelissen [Thu, 31 May 2012 17:50:29 +0000 (10:50 -0700)]
Ensure global effects are on the correct output
Global effects such as the visualizer would sometimes not be on the
right output, for example when switching from a2dp to wired headset
or back, when there are both regular and deep buffer outputs available.
We now check which of the available outputs the global effect should
be on when more than one is available.
b/
6528772
Change-Id: Ie268e32ef41e7888da67c24730dc93750a2cf579
Eric Laurent [Mon, 21 May 2012 15:50:50 +0000 (08:50 -0700)]
audio policy: allow disabling A2DP for media.
Added FORCE_NO_BT_A2DP forced use to allow applications to
override default policy to use A2DP whenever connected.
Bug
6485897.
Change-Id: I784271c062294fbe1aff7884965075b40c68dc24
Eric Laurent [Wed, 16 May 2012 02:16:30 +0000 (19:16 -0700)]
audio policy: fix in call volume problem.
When switching audio path, it is sometimes required
to temporarily mute certain streams to avoid glitches.
The unmute command is sent with a delay but the volume applied
when unmuting is computed according to the state at the time of mute.
If the device selection changes after the delayed unmute is programmed
the new volume will not correspond to the new device.
setStreamMute() now accepts a device selection as input parameter which is
used instead of current device for volume computation.
Bug
6497819.
Change-Id: I355ebf9e1afe814fa5c2723bda9c40e58f921b46
Jeff Brown [Sat, 12 May 2012 00:40:45 +0000 (17:40 -0700)]
Delete unused function.
set_last_user_activity_timeout() is no longer used or useful.
It opens a sysfs node that no longer exists that used to
be published by a daemon that is no longer even compiled
and that is about to be deleted. It used to be called
by the power manager with a huge value whose purpose was
essentially to disable the timeout feature altogether.
Long live dead code!
Bug:
6435382
Change-Id: If8f97a66f4e963a11e1c6b67ad97b41b2613043e
Eric Laurent [Thu, 10 May 2012 17:12:19 +0000 (10:12 -0700)]
Reduce system stream volume.
Reduce system stream volume by 6dB as
UI sounds are now perceived as being too loud.
Issue
6448481.
Change-Id: I0237eb94245014724dfdf55253049340e2162af8
Eric Laurent [Wed, 25 Apr 2012 22:47:56 +0000 (15:47 -0700)]
system and UI sounds volume policy
Added specific volume curves for AUDIO_STREAM_SYSTEM,
AUDIO_STREAM_ENFORCED_AUDIBLE and AUDIO_STREAM_DTMF.
Volume for these streams tracks AUDIO_STREAM_RING on phones
and AUDIO_STREAM_MUSIC on tablets but is contrained in the range
-24dB to -6dB on speaker and -24dB to -12dB on headset.
STRATEGY_ENFORCED_AUDIBLE routing policy is now the same as
STRATEGY_MEDIA in countries where not enforced.
Change-Id: If58d96559bfe2bbff4cd94c631d5933bd940778e
Dima Zavin [Tue, 24 Apr 2012 07:21:59 +0000 (00:21 -0700)]
audio_policy: set some reasonable defaults if audio_policy.conf is not found
Change-Id: I25f7407c34b3032d4e77a27a4ac47b648098d9b0
Signed-off-by: Dima Zavin <dima@android.com>
Dima Zavin [Mon, 23 Apr 2012 23:51:00 +0000 (16:51 -0700)]
audio_policy: look for config file in /vendor first
Change-Id: If10308f688437e1682e4104120772cfce16e9d89
Signed-off-by: Dima Zavin <dima@android.com>
Eric Laurent [Sun, 22 Apr 2012 20:57:53 +0000 (13:57 -0700)]
audio policy: volume burst when switching device
The addition of the per device volume feature has introduced
a problem where a volume burst can be heard in the headphones
just after insertion if the speaker volume is much higher than the
headphones volume.
Added a temporary mute of the output when switching device to force
volume ramp to 0 and back up to new volume.
Issue
5984108.
Change-Id: I5c9ffbbcadd12d25c78cc2614d351346b8186c55
Eric Laurent [Sat, 14 Apr 2012 01:48:06 +0000 (18:48 -0700)]
audio policy: add support for deep audio buffers
Added definitions for parsing deep buffer flags in output profiles.
Make sure that sound start is delayed enough to allow
duck/mute effect to apply before starting a notification on an output
with lower latency.
Change-Id: I1578e245da19d1a0f9ec62a2ea6dddaf82ea282b
Eric Laurent [Wed, 18 Apr 2012 16:28:52 +0000 (09:28 -0700)]
rename audio policy flags
Change-Id: Ic42eba3432671f651c9703a07fe7b429a8ec0dff
Eric Laurent [Sat, 14 Apr 2012 01:49:20 +0000 (18:49 -0700)]
audio: update to new audio HAL device API.
Change-Id: I27c5e1e1041f62530884ec5d929e7d82f091912a
Eric Laurent [Fri, 6 Apr 2012 16:07:07 +0000 (09:07 -0700)]
audio policy: added rules for USB audio devices
Change-Id: If712b0c7fcf281d66d34614529f3433e56e058fb
Jean-Michel Trivi [Thu, 5 Apr 2012 18:44:49 +0000 (11:44 -0700)]
Allow non-direct output of any channel mask
Because of the downmix capability of the mixer, do not prevent
a non-direct output to be retrieved based on channel mask.
Change-Id: I911f95f4055c2134298c233d14f2f5d586091fd4
Eric Laurent [Wed, 28 Mar 2012 18:27:13 +0000 (11:27 -0700)]
audio policy: load audio hw modules
Audio hw modules are now loaded according to configuration
data read from audio_policy.conf. They are not loaded anymore
from a hardcoded list in AudiFlinger.
Output and input streams are opened on the hw module by which
they are exposed.
Also removed obsolete "acoustics" flags for input streams.
Change-Id: I8dc658cc83890d3ac7d5e36c372a03732aa5b0c4
Eric Laurent [Tue, 20 Mar 2012 20:44:51 +0000 (13:44 -0700)]
audio policy: use configuration file
The audio policy manager implementation now reads a configuration file at
boot time that contains descriptors for available audio hardware
modules and for each module the profiles of available inputs and outputs streams.
The configuration file path on the target is: /system/etc/audio_policy.conf.
A default configuration file is given that defines a basic configuration
with one primary audio hw module capable of playback and capture.
Each platform or device should have its own audio_policy.conf file.
Also removed default value of fromCache argument of getDeviceForStrategy()
and getNewDevice() methods.
Change-Id: I0c773d2331508bbc787f89b123dd6a7b8c10d459
Jean-Michel Trivi [Thu, 15 Mar 2012 16:33:34 +0000 (09:33 -0700)]
Only duplicate notifications when no media is playing
Map the NOTIFICATION stream type to a new strategy,
named STRATEGY_NOTIFICATION_RESPECTFUL, which differs
from STRATEGY_NOTIFICATION in that, when media is
playing, the notifications will use the same output
as the MEDIA strategy. This will results in the
notifications not being duplicated on the speaker
when a headset is in use for media playback.
Change-Id: I032be0e2d383c69b5b6c912d7174753f5572c4b4
Mike Lockwood [Thu, 22 Mar 2012 00:44:34 +0000 (17:44 -0700)]
Merge remote-tracking branch 'goog/ics-aah-exp'
empty merge -s ours
Change-Id: I11a8a28ffccb4d28f2bbed4d55919443cae24e9f
Mike Lockwood [Thu, 22 Mar 2012 00:43:54 +0000 (17:43 -0700)]
Merge commit '
5b71e6f'
Add an implementation of get_next_write_timestamp.
Change-Id: Ie8e19307bafdb057d06bf3c536380c5740f830a6
Mike Lockwood [Thu, 22 Mar 2012 00:42:25 +0000 (17:42 -0700)]
Merge commit '
617c80a'
Add a bridge implementation of get_master_volume.
Conflicts:
audio/audio_hw_hal.cpp
Change-Id: Icff9d8dce05d1d811fca815cc39cb38a1df293f9
Glenn Kasten [Tue, 20 Mar 2012 00:31:15 +0000 (17:31 -0700)]
Remove obsolete references to libmedia
Change-Id: I65c10c2c6248a439d8ba6b3e9d540072fb25039f
Glenn Kasten [Fri, 16 Mar 2012 17:36:22 +0000 (10:36 -0700)]
Merge "Add libmedia_native"
Kenny Root [Thu, 15 Mar 2012 20:10:19 +0000 (13:10 -0700)]
Add support for EINTR to wifi.c
Some system calls can be interrupted. wifi.c in particular was getting
into error conditions during bugreport because it doesn't handle EINTR
at all.
Change-Id: I7bec432a0b3dca7dcc5c03c5e9f5e9ed73fa3c4b
Glenn Kasten [Thu, 15 Mar 2012 16:45:04 +0000 (09:45 -0700)]
Add libmedia_native
Change-Id: I1d66327828a5adb06911de1f72076bc0295255c1
Eric Laurent [Thu, 8 Mar 2012 21:39:13 +0000 (13:39 -0800)]
audio policy: use audio_devices_t when appropriate
Change-Id: I0b4e2ff705fce96b40fdda28b1bc4b514438bec6
Eric Laurent [Thu, 8 Mar 2012 03:19:29 +0000 (19:19 -0800)]
audio policy: spaced comments in header file
Change-Id: Ie72dcb9e33afb217bb7e37081500a7fc53d7a047
Eric Laurent [Thu, 8 Mar 2012 03:04:55 +0000 (19:04 -0800)]
audio policy: use common string for A2DP address
Use definition from audio.h for A2DP sink address parameter.
Change-Id: I2d7905b8e3dd71fab2efc68ae16682e09c3f872e
Eric Laurent [Fri, 17 Feb 2012 18:55:44 +0000 (10:55 -0800)]
audio policy manager: more generic A2DP impl.
This change makes support for A2DP related audio policy more generic:
-removed WITH_A2DP compilation switch
-use output profile descriptors listing the parameters
(sampling rate, format...) devices and attributes (low power, tunneling...)
for each available output.
All the behavior specific to A2DP is derived from the A2DP output profile
descriptor.
- removed obsolete a2dpUsedForSonification() method.
This is a first step towards a more generic support for different audio
hardware modules (USB, HDMI) and output streams supporting different
combinations of parameters (sampling rate, format...) and attributes
(low power, tunneling...).
Ultimately, the hw modules and output descriptors will loaded from a
configuration file.
Change-Id: Ife3e49e1afbcb72613bfc8ce38919bb087ca85ea
Todd Poynor [Sat, 11 Feb 2012 08:44:22 +0000 (00:44 -0800)]
libhardware_legacy: Remove set_screen_state
The early-suspend/late-resume interface to /sys/power/state
is being moved to the default/legacy Power HAL.
The emulator interface is being moved to the emulator
Power HAL.
Change-Id: I66a1e611e6d907f20335f047001745f818dfc846
Signed-off-by: Todd Poynor <toddpoynor@google.com>
Eric Laurent [Thu, 16 Feb 2012 02:40:31 +0000 (18:40 -0800)]
Fix volume not restored when exiting silent mode
The change for volume per device introduced a problem where if a headset
is plugged in while in silent mode, the sound will not be restored
at the first press on volume up key but only at the second press.
This is because when exiting silent mode, AudioService reapplies the
last known volume for all devices in any order and the last volume
applied prevails, even if it is for a device other than currently selected
by audio policy manager.
The fix consists in applying a new volume only if the device indicated
matches currently selected device on an output.
Change-Id: I778b90a9ec5a8b4a15e0333bd045f2dd327f388c
Irfan Sheriff [Tue, 14 Feb 2012 23:37:17 +0000 (15:37 -0800)]
Merge "Fixes for concurrency support"
Glenn Kasten [Fri, 3 Feb 2012 16:31:19 +0000 (08:31 -0800)]
Merge "Use audio_in_acoustics_t consistently"
The Android Open Source Project [Wed, 1 Feb 2012 18:10:28 +0000 (10:10 -0800)]
The Android Open Source Project [Wed, 1 Feb 2012 18:01:31 +0000 (10:01 -0800)]
am
b4ff7281: Reconcile with ics-mr1-release
* commit '
b4ff728122f67ae9bf0f5afe4ff65b3ba3068b59':
The Android Open Source Project [Wed, 1 Feb 2012 16:50:23 +0000 (08:50 -0800)]
Reconcile with ics-mr1-release
Change-Id: Ibf33a69673d9acafb9199d331fc88a7d80dbeb20
Glenn Kasten [Fri, 27 Jan 2012 21:03:05 +0000 (13:03 -0800)]
Use audio_in_acoustics_t consistently
Change-Id: I9875afdf21937c88a5decc9d94e89fddffc3519e
Glenn Kasten [Fri, 27 Jan 2012 00:46:31 +0000 (16:46 -0800)]
Use audio_source_t consistently
Change-Id: I11de4e92254e128643d8f158c74dcfee97e51005
Irfan Sheriff [Wed, 11 Jan 2012 00:24:51 +0000 (16:24 -0800)]
Fixes for concurrency support
Change-Id: Ia7251dc86184fff710234c70a8ad54a6b245809a
Glenn Kasten [Fri, 20 Jan 2012 22:50:30 +0000 (14:50 -0800)]
Merge "Use audio_format_t consistently"
Glenn Kasten [Fri, 20 Jan 2012 18:07:13 +0000 (10:07 -0800)]
Merge "Audio policy HAL set_ringer_mode is deprecated"
Glenn Kasten [Thu, 19 Jan 2012 00:27:02 +0000 (16:27 -0800)]
Fix typos
Change-Id: Ie0acd07861604e66f571e0c1f43cfdccf12ea691
Glenn Kasten [Wed, 18 Jan 2012 23:24:50 +0000 (15:24 -0800)]
Audio policy HAL set_ringer_mode is deprecated
Change-Id: I66ef40ed381151ba61debe20edaa53bece0cc139
Eric Laurent [Wed, 18 Jan 2012 01:34:58 +0000 (17:34 -0800)]
Merge "audio policy manager: stream volume per device"
Eric Laurent [Thu, 15 Dec 2011 02:18:36 +0000 (18:18 -0800)]
audio policy manager: stream volume per device
Improve volume management by keeping track of volume for each type
of device independently.
AudioPolicyManagerBase now keeps track of stream volumes for each device
and apply volume according to current device selection.
Methods to set and get stream volume now specify the device class.
A value for "default" device is always present for each stream and is used
if a device is selected and no specific volume was ever set for this device.
Change-Id: I06d8f43aa151a09014f7e47e81304c73ff82e9f8
Glenn Kasten [Tue, 17 Jan 2012 19:33:14 +0000 (11:33 -0800)]
Merge "Use audio_mode_t consistently"
Glenn Kasten [Thu, 12 Jan 2012 19:12:59 +0000 (11:12 -0800)]
Use audio_stream_type_t consistently
Change-Id: Ibeb4071cedb930c76dd62222b29844733bdc1548
Glenn Kasten [Thu, 12 Jan 2012 23:01:42 +0000 (15:01 -0800)]
Use audio_format_t consistently
Was int
Change-Id: I8cc1beaa8006fb0a135cf1135955155090c8e87e
Glenn Kasten [Mon, 9 Jan 2012 18:41:59 +0000 (10:41 -0800)]
Use audio_mode_t consistently
Change-Id: I62e23b81e3a411a0d9f012b363373d938827a2e4
Irfan Sheriff [Thu, 12 Jan 2012 00:48:39 +0000 (16:48 -0800)]
Fix monitor socket poll
Bug:
5534039
Change-Id: I28c41f896347963b0ded8415d1a51ff95cbf4b2d
Steve Block [Sun, 8 Jan 2012 10:18:02 +0000 (10:18 +0000)]
Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/#/c/157220
Bug:
5449033
Change-Id: Idfcd2f2269080d92a621dc432c65f7cf244588af
Steve Block [Thu, 5 Jan 2012 23:27:53 +0000 (23:27 +0000)]
Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/157065
Bug:
5449033
Change-Id: I86e4ce26d8fba68584d0a7fc17111b53c56d2932
Steve Block [Wed, 4 Jan 2012 20:07:20 +0000 (20:07 +0000)]
Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/156801
Bug:
5449033
Change-Id: I21aea046270c8700d349a4181c559d1b05333a1b
Steve Block [Tue, 20 Dec 2011 16:25:34 +0000 (16:25 +0000)]
Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/156016
Bug:
5449033
Change-Id: I9dfdc3f00a5f4f5b6ef4c75280ce2594ab018577
Irfan Sheriff [Tue, 27 Dec 2011 21:50:07 +0000 (13:50 -0800)]
Add support for p2p socket communication
Right now, everything goes over the primary interface socket connection.
Add support for a seperate connection over the p2p interface.
Change-Id: I09118f88cfaa201b2d62d27add410cfd441d4454
The Android Open Source Project [Fri, 9 Dec 2011 22:58:00 +0000 (14:58 -0800)]
am
af9565aa: Reconcile with ics-mr1-release
* commit '
af9565aa8be0136463ec549d9d3abdd906d2c390':
Eric Laurent [Thu, 8 Dec 2011 19:42:52 +0000 (11:42 -0800)]
audio policy manager: remove ringer mode dump
The ringer mode is at the moment not passed down from AudioService to
AudioPolicyManager as it is currently not used in any routig decision.
So the value store in audio policy manager is wrong and the dump is miss leading.
Change-Id: I3c21c168393470fd64c1b73e3c511576a9acdd7e
The Android Open Source Project [Thu, 8 Dec 2011 18:22:08 +0000 (10:22 -0800)]
Reconcile with ics-mr1-release
Change-Id: Ifb9dad264079f0a566dd978dd56414fbaf59b9e0
The Android Open Source Project [Fri, 4 Nov 2011 15:31:25 +0000 (08:31 -0700)]
Reconcile with ics-mr1-release
Change-Id: I2b1dcb119df18200eebaef2f888df7aaaa150b34
Eric Laurent [Wed, 2 Nov 2011 17:31:48 +0000 (17:31 +0000)]
am
c16ac09f: Force camera shutter sound to speaker in Japan.
* commit '
c16ac09f510437e8340be691720177a490ae78f0':
Force camera shutter sound to speaker in Japan.
The Android Automerger [Wed, 2 Nov 2011 13:46:14 +0000 (06:46 -0700)]
merge in ics-mr1-release history after reset to ics-mr1
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
The Android Open Source Project [Mon, 31 Oct 2011 20:19:23 +0000 (13:19 -0700)]
Reconcile with ics-mr1-release
Change-Id: Iadb285a24b3129b0dc2bd7089598a51d4af2eb6b
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
The Android Automerger [Sun, 23 Oct 2011 14:01:23 +0000 (07:01 -0700)]
merge in ics-release history after reset to master
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
The Android Automerger [Wed, 19 Oct 2011 14:44:52 +0000 (07:44 -0700)]
merge in ics-release history after reset to master
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
The Android Automerger [Sun, 9 Oct 2011 14:00:41 +0000 (07:00 -0700)]
merge in ics-release history after reset to master
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>
The Android Automerger [Thu, 6 Oct 2011 14:00:45 +0000 (07:00 -0700)]
merge in ics-release history after reset to master
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
The Android Automerger [Thu, 29 Sep 2011 00:57:56 +0000 (17:57 -0700)]
merge in ics-release history after reset to master
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
The Android Automerger [Tue, 20 Sep 2011 14:00:24 +0000 (07:00 -0700)]
merge in ics-release history after reset to master
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
The Android Automerger [Tue, 13 Sep 2011 13:34:14 +0000 (06:34 -0700)]
merge in ics-release history after reset to master