OSDN Git Service
Chih-Wei Huang [Wed, 31 Dec 2014 14:48:42 +0000 (22:48 +0800)]
powerbtnd: simulate power key on resuming
Chih-Wei Huang [Sun, 21 Dec 2014 05:45:27 +0000 (13:45 +0800)]
wifi: determine whether to unload the driver by a property
Currently the brcmfmac driver seems to be buggy to be unloaded.
Don't unload it until we find a real solution.
Chih-Wei Huang [Fri, 27 Jun 2014 09:52:33 +0000 (17:52 +0800)]
wifi: support built-in wifi drivers
If a wifi interface is found but no module name,
assume it's built-in and just return ok.
Chih-Wei Huang [Mon, 23 Jul 2012 06:32:37 +0000 (14:32 +0800)]
add powerbtnd to simulate long press of power button.
On x86 PC, power button usually generates key press and release events
simultaneously. However, the android framework expects a long press
of power button to invoke the power off dialog. The daemon simulates a
long press of power button,
On poweroff.doubleclick=0, one click to power button invokes poweroff
dialog directly.
On poweroff.doubleclick=1, one click to power button suspends the system,
while double click in one second invokes poweroff dialog.
A target needs to add excluded-input-devices.xml to exclude
'Power Button' from processing by EventHub.
Chih-Wei Huang [Mon, 28 Nov 2011 08:15:39 +0000 (16:15 +0800)]
wifi: auto-detect the module name and path
Chih-Wei Huang [Mon, 28 Nov 2011 06:56:46 +0000 (14:56 +0800)]
wifi: do not hardcode module name and path
The patch allows the module name and path to be obtained by the properties
wlan.modname and wlan.modpath.
Jean-Michel Trivi [Fri, 15 Nov 2013 00:30:20 +0000 (16:30 -0800)]
Define and use DRC-specific volume curves when applicable
Add support for property defining whether a DRC on the speaker path
is enabled and will boost soft sounds.
Define new volume curves with more attenuations than existing ones
to compensate for DRC-induced boost on sonification sounds to
provide a more "linear" control to the user over the applied volume.
Bug
11600699
Change-Id: If23dd097a8b9b5ebb61e75dd8512ff75e63ba899
Eric Laurent [Wed, 30 Oct 2013 01:17:47 +0000 (01:17 +0000)]
Merge "audio policy: fix gapless playback when effects enabled" into klp-dev
Ed Heyl [Thu, 17 Oct 2013 00:43:55 +0000 (17:43 -0700)]
merge in klp-release (no-op)
Eric Laurent [Sat, 12 Oct 2013 23:29:39 +0000 (16:29 -0700)]
audio policy: fix gapless playback when effects enabled
Do not allow offloading if one non offloadable effect is enabled. This prevents from
creating an offloaded track and tearing it down immediately after start when audioflinger
detects there is an active non offloadable effect.
Not doing so breaks gapless playback because AwesomePlayer will always be able to open
an offloaded track which will not be compatible with the previous PCM track and
Audiosink::open() will not recycle it.
Bug:
11181933.
Change-Id: I6d163806849d9093b9ec701ba8e8c1ccb658e3c8
The Android Automerger [Tue, 8 Oct 2013 13:00:52 +0000 (06:00 -0700)]
merge in klp-release history after reset to klp-dev
Eric Laurent [Sun, 6 Oct 2013 19:39:32 +0000 (12:39 -0700)]
audio policy: fix direct output selection
commit
a527ffd broke the selection of an available
direct output profile in getProfileForDirectOutput().
getProfileForDirectOutput() should check for direct output profiles
regardless of the flags provided to getOutput().
Bug:
11051912.
Change-Id: I4a84734331bfed03d6024ea1c2e8776c27d0b28f
The Android Automerger [Sun, 6 Oct 2013 13:01:34 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev
Eric Laurent [Fri, 4 Oct 2013 01:02:16 +0000 (18:02 -0700)]
audio policy: fix DTMF tones volume while in call
When voice call stream volume is at 0, DTMF are not heard at all.
DTMF volume should follow the behavior of voice call volume which
is never completely muted.
Bug:
10932676.
Change-Id: Iaf0e33284be75b00516a837907e66be3123e5331
The Android Automerger [Wed, 2 Oct 2013 13:01:21 +0000 (06:01 -0700)]
merge in klp-release history after reset to klp-dev
Eric Laurent [Tue, 1 Oct 2013 02:20:15 +0000 (19:20 -0700)]
remove audio HAL warning when inserting a headset
A valid offload info structure must be provided when
opening an offload output stream in checkOutputsForDevice()
upon headset insertion.
Bug:
8174034.
Change-Id: Id800a206536e5ce979febf89747a51db581c53b6
Eric Laurent [Thu, 26 Sep 2013 18:28:36 +0000 (11:28 -0700)]
audio: fix remote submix sampling rates
Only list 48000 Hz in supported sampling rates for remote submix
output and input stream profiles to avoid mismatch betwen playback
and capture.
Bug:
10900252.
Change-Id: Id96e914caeb42e8f4aa5fe4e55e19156cdd67b58
Eric Laurent [Thu, 26 Sep 2013 18:28:36 +0000 (11:28 -0700)]
audio: fix remote submix sampling rates
Only list 48000 Hz in supported sampling rates for remote submix
output and input stream profiles to avoid mismatch betwen playback
and capture.
Bug:
10900252.
Change-Id: Id96e914caeb42e8f4aa5fe4e55e19156cdd67b58
Eric Laurent [Fri, 13 Sep 2013 00:39:21 +0000 (17:39 -0700)]
audio policy: add support for audio effect offload
Add rules to select the appropriate output for global
effects.
Move global effects if needed when an offloaded output is
created or released.
Bug:
8174034.
Change-Id: I0bbd8e9f8aa717f672462dd74ba0d01eaef1fda7
Eric Laurent [Thu, 12 Sep 2013 00:15:03 +0000 (00:15 +0000)]
Merge "AudioPolicyManageBase changes to enable HOTWORD audio source" into klp-dev
Eric Laurent [Mon, 9 Sep 2013 17:42:47 +0000 (10:42 -0700)]
AudioPolicyManageBase changes to enable HOTWORD audio source
- This change enables HOTWORD audio source to be preempted by any other
audio source
Bug:
10640877.
Change-Id: I6f7acbe95a6521306db70ad73260d2ba7b38b940
Eric Laurent [Mon, 9 Sep 2013 20:24:05 +0000 (13:24 -0700)]
audio policy: extend min duration for offload
Extend minimun duration of offloaded audio content
to 1 minute to avoid offloading short clips like
TTS generated files.
Bug:
8174034.
Change-Id: Ied21557c300af4b27d99388e069576e36804087f
Eric Laurent [Fri, 30 Aug 2013 22:47:52 +0000 (15:47 -0700)]
audio policy: remove verbose logging.
Change-Id: I268935bd8f7e58f90c698c098686a04681b43887
Eric Laurent [Fri, 30 Aug 2013 00:29:19 +0000 (17:29 -0700)]
audio policy: disable audio offloading with video
Do not enable offloading of audio decompression when
playing video.
Change-Id: I6ee8b59370219f5ef810a99a27ba4a1cf222b55b
Chong Zhang [Sat, 24 Aug 2013 23:44:47 +0000 (16:44 -0700)]
audio policy: allow virtual input even if there are active inputs
Bug:
10460751
Change-Id: Ic6fcd14162e9c6e03366d887063321e21fcf14cd
Jeff Brown [Sat, 17 Aug 2013 03:10:48 +0000 (20:10 -0700)]
Automatically enable/disable remote submix when input started.
When recording from the audio submix begins, enable the remote
audio submit output device. When it ends, disable it.
Bug:
10265163
Change-Id: Ia0dc2e20623bb834d06561469ce856688991243b
Vinit Deshapnde [Thu, 8 Aug 2013 17:39:25 +0000 (10:39 -0700)]
Use a single socket to communicate with supplicant
This helps to preapre for future updates from external sources.
Bug:
9298955
Change-Id: I4c63ad5fc1ea3564aab38cfce955de19bad75c0c
(cherry picked from commit
759cc323cb586192d591a815b0fb9d839536fcd6)
Richard Fitzgerald [Mon, 13 May 2013 10:52:24 +0000 (11:52 +0100)]
Code changes for audio offload support
- Share existing offload output if compatible instead of
creating a new one. Hardware has limited number of
offload channels (possible only 1) so we must use as
few as possible
- Changes to routing handling for offloaded outputs
Change-Id: I11111d8f504828595bd8dbf66444cbd1202e7192
Signed-off-by: Eric Laurent <elaurent@google.com>
The Android Open Source Project [Tue, 16 Jul 2013 18:20:54 +0000 (11:20 -0700)]
am
4c7db154: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
4c7db154564031237df705641f27d504d4ae3f11':
audio policy: apply default device volume
The Android Open Source Project [Tue, 16 Jul 2013 18:19:23 +0000 (11:19 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I44d1b4bc2d06e2ec3d7837693a1880d7e6cf1774
Eric Laurent [Mon, 15 Jul 2013 22:35:58 +0000 (15:35 -0700)]
audio policy: apply default device volume
Make sure that we apply default device volume to
active outputs in case no specific volume for selected
device is received afterward.
Bug:
9760269.
Change-Id: I216de40396e1075e77493c97e8b192cd3a31d546
Eric Laurent [Tue, 16 Jul 2013 00:26:21 +0000 (17:26 -0700)]
am
8e7e4254: am
e92d6238: audio policy: apply default device volume
* commit '
8e7e42547116b1d5f49118ba41946b2906ad3936':
audio policy: apply default device volume
Eric Laurent [Tue, 16 Jul 2013 00:23:36 +0000 (17:23 -0700)]
am
e92d6238: audio policy: apply default device volume
* commit '
e92d623811f3fd3e7cc5e5dd8bc93c0c0a8fdf50':
audio policy: apply default device volume
Eric Laurent [Mon, 15 Jul 2013 22:35:58 +0000 (15:35 -0700)]
audio policy: apply default device volume
Make sure that we apply default device volume to
active outputs in case no specific volume for selected
device is received afterward.
Bug:
9760269.
Change-Id: I216de40396e1075e77493c97e8b192cd3a31d546
Dmitry Shmidt [Fri, 12 Jul 2013 17:10:40 +0000 (10:10 -0700)]
wifi: Sync with wpa_supplicant commit
1075b29
Change-Id: I502a925054c13f3ceb43445e1c4703427ed4ca7f
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Glenn Kasten [Tue, 2 Jul 2013 21:08:21 +0000 (14:08 -0700)]
Include header files used by this header
Change-Id: I36c6f580c698706b961150978e2124f9235eab12
Richard Fitzgerald [Mon, 25 Mar 2013 16:18:26 +0000 (16:18 +0000)]
Add audio policy API changes for audio offload
Changes to the API of audio policy for audio offload support:
- Add isOffloadSupported() function
- Add OUTPUT_FLAG_OFFLOAD
- Extend AudioOutputDescriptor to include a sharing count for direct outputs
- Pass audio_offload_info_t when opening output streams
Change-Id: I5ad26418fdb286eb7ae299d586dd1fd525d48ab9
Signed-off-by: Richard Fitzgerald <rf@opensource.wolfsonmicro.com>
Signed-off-by: Eric Laurent <elaurent@google.com>
Colin Cross [Tue, 18 Jun 2013 01:33:50 +0000 (18:33 -0700)]
am
248c9aa9: am
2769ce79: Merge "Use accessor to read property serial numbers"
* commit '
248c9aa92c8f3e2f33a0e8a02436ea366266495f':
Use accessor to read property serial numbers
Colin Cross [Tue, 18 Jun 2013 01:21:38 +0000 (18:21 -0700)]
am
2769ce79: Merge "Use accessor to read property serial numbers"
* commit '
2769ce79def80023e454708deec176e3259dc586':
Use accessor to read property serial numbers
Colin Cross [Tue, 18 Jun 2013 01:11:56 +0000 (01:11 +0000)]
Merge "Use accessor to read property serial numbers"
Colin Cross [Mon, 4 Feb 2013 20:34:20 +0000 (12:34 -0800)]
Use accessor to read property serial numbers
Hide the implementation of the property structures by using
an accessor.
(cherry picked from commit
14c02f245e56687b765487d25a034d71196d33b6)
Change-Id: Id86ff99d8430fa73bbc745aaa0ff2b7713ca7885
Colin Cross [Mon, 4 Feb 2013 20:34:20 +0000 (12:34 -0800)]
Use accessor to read property serial numbers
Hide the implementation of the property structures by using
an accessor.
Change-Id: Ic604935882f6085e3d082baa651bad9bafe0a54a
Dmitry Shmidt [Thu, 6 Jun 2013 23:51:59 +0000 (16:51 -0700)]
wifi: Move common file from wpa_supplicant_lib
Change-Id: I902f864da4317fd637fbc31036133c49a8ae0724
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Dmitry Shmidt [Thu, 6 Jun 2013 17:45:48 +0000 (10:45 -0700)]
wifi: Skip adding interface prefix if exists
Bug:
9313188
Change-Id: I63784493c84ac4ffcc9810a7798b1c0de1b0f68b
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Dmitry Shmidt [Wed, 29 May 2013 17:34:39 +0000 (10:34 -0700)]
wifi: Use global control socket
Change-Id: I11e4438ec0b36575e1b5a563ac4da57303d028c7
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Dmitry Shmidt [Thu, 30 May 2013 17:49:15 +0000 (10:49 -0700)]
wifi: Add command buffer length parameter to wifi_command()
Change-Id: I832bc51279e0fb7d3002298f87a35b816b666ad5
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Dmitry Shmidt [Wed, 22 May 2013 23:45:57 +0000 (16:45 -0700)]
wifi: Use wpa_ctrl_cleanup() function from wpa_supplicant
Change-Id: I24af9ec380e138f24864cd9359c6901b8b29e5ee
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Eric Laurent [Tue, 21 May 2013 15:55:38 +0000 (08:55 -0700)]
am
66707435: audio policy: fix device selection in startInput()
* commit '
66707435156d8d99d795271a7bd54943065b4c2d':
audio policy: fix device selection in startInput()
Eric Laurent [Fri, 17 May 2013 21:11:27 +0000 (14:11 -0700)]
audio policy: fix device selection in startInput()
Check again input device selection when capture starts in case
conditions have changed since the input stream was opened.
This is related to but does not fix issue
8761558. It makes the
selection of BT SCO device consistent.
Bug:
8761558
Change-Id: I386b638e9c3238711e16fb848449af561624359e
Irfan Sheriff [Fri, 12 Apr 2013 23:09:04 +0000 (16:09 -0700)]
am
a776ffd2: Rewrite an invalid config file
* commit '
a776ffd243bbd02948ebefd43f4ac2690ebb11e6':
Rewrite an invalid config file
Irfan Sheriff [Fri, 12 Apr 2013 22:46:29 +0000 (15:46 -0700)]
Rewrite an invalid config file
We saw a case of config file being corrupted. Add a mechanism to
recover from this when wifi is toggled off and on.
Bug:
8569820
Change-Id: If2baceb065838d2adb5cde61772d25a05455fc90
Ying Wang [Wed, 10 Apr 2013 05:33:14 +0000 (22:33 -0700)]
Ying Wang [Wed, 10 Apr 2013 04:57:48 +0000 (21:57 -0700)]
Add liblog
Bug:
8580410
Change-Id: Ib86983540b34e8c9083979fdd21a17715ec53f80
Eric Laurent [Thu, 4 Apr 2013 21:59:22 +0000 (14:59 -0700)]
am
5a950c96: audio policy: reuse direct output when possible
* commit '
5a950c960cd40648cc3ab8defe817f88e0a7ecf4':
audio policy: reuse direct output when possible
Eric Laurent [Thu, 4 Apr 2013 00:31:04 +0000 (17:31 -0700)]
audio policy: reuse direct output when possible
Modified getOutput() logic to not systematically
open a new direct output when a profile matches a request.
This causes a problem when transitioning between two
multichannel tracks as the audio HAL will most of the times
only support one direct output stream open at a time.
Instead, reuse an open output if all the parameters match
or force close the output before reopening it.
Also modify releaseOuput():
- close a direct output only if no client is using it anymore
- call closeOutput() instead of removing the output from
the open output list: this factors in code executed when closing an
output stream.
Bug
8388941
Change-Id: Ic3d3beb21063622ddf57a5b932f93d56f2986f54
Eric Laurent [Tue, 26 Mar 2013 00:26:46 +0000 (00:26 +0000)]
am
80f5b040: audio policy: fix music glitch when starting call
* commit '
80f5b0400f86d49e70aa1a793b34f34492f005bc':
audio policy: fix music glitch when starting call
Eric Laurent [Mon, 25 Mar 2013 16:58:09 +0000 (09:58 -0700)]
audio policy: fix music glitch when starting call
When answering a call in silent mode, music playing over A2DP
was not immediately muted by current audio policy manager logic.
The fix consists in muting media strategy on all output streams
immediately when entering in call.
Also add methods to AudioOutputDescriptor to report
recent global, per strategy and per stream activity.
Bug
8315512
Change-Id: I4a90eb05db50e4f22374d02b1e647e8662f6bec6
Jean-Baptiste Queru [Mon, 11 Mar 2013 20:56:10 +0000 (20:56 +0000)]
am
58d6b9eb: (-s ours) am
10f06dc0: am
0b904fda: am
93bb0058: am
4bcc1fdb: (-s ours) am
b25a2fcf: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
58d6b9eb20a9805ea7cecff1df01259e8a2ce1d4':
Jean-Baptiste Queru [Mon, 11 Mar 2013 20:44:29 +0000 (13:44 -0700)]
am
10f06dc0: am
0b904fda: am
93bb0058: am
4bcc1fdb: (-s ours) am
b25a2fcf: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
10f06dc0787c20d9ffab07e59654322b9348c056':
Jean-Baptiste Queru [Mon, 11 Mar 2013 20:13:35 +0000 (13:13 -0700)]
am
0b904fda: am
93bb0058: am
4bcc1fdb: (-s ours) am
b25a2fcf: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
0b904fdaa636372e9173f1fb4a5dae5c382aabb8':
Jean-Baptiste Queru [Mon, 11 Mar 2013 20:00:42 +0000 (13:00 -0700)]
am
93bb0058: am
4bcc1fdb: (-s ours) am
b25a2fcf: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
93bb0058bd3e5c0703797289f88a033789249766':
Jean-Baptiste Queru [Mon, 11 Mar 2013 19:42:00 +0000 (12:42 -0700)]
am
4bcc1fdb: (-s ours) am
b25a2fcf: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
4bcc1fdb8ef242e6f8fe55181e16c18c5cd220ad':
Jean-Baptiste Queru [Mon, 11 Mar 2013 19:27:41 +0000 (12:27 -0700)]
am
b25a2fcf: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
b25a2fcfae02ff802b81978ec82f0da8d2735d77':
Jean-Baptiste Queru [Mon, 11 Mar 2013 19:20:16 +0000 (12:20 -0700)]
Reconcile with jb-mr1-release - do not merge
Eric Laurent [Wed, 27 Feb 2013 00:10:05 +0000 (16:10 -0800)]
audio policy: fix in call capture device
Allow use of default capture device when
AUDIO_SOURCE_VOICE_UPLINK is specified and the platform
does not support AUDIO_DEVICE_IN_VOICE_CALL.
Change-Id: Ibbc314f60c91e5a0fa75d57878f2d2a96ef2d83b
Eric Laurent [Sat, 2 Mar 2013 01:35:51 +0000 (17:35 -0800)]
audio policy: fix music glitch with touch sounds
There is a brief music interruption when a touch sound
is played the first time after the headset insertion.
This is due to a bug in audio policy manager logic to prevent
volume bursts while changing device while music is playing.
The fix consists in muting music only on current output stream
when changing device, not all output streams.
Also prevent unecessary device change if the requested device
is not supported by the output stream profile.
Bug:
8301565
Change-Id: I00daab19bbdda10ca856a05fa32a1e333e1b9469
Dmitry Shmidt [Thu, 28 Feb 2013 01:45:59 +0000 (17:45 -0800)]
wifi: Remove obsolete variables
Change-Id: I4759c26bf59f593650374ae4b205e8a1f83a8d68
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Eric Laurent [Mon, 11 Feb 2013 21:42:47 +0000 (21:42 +0000)]
Merge "audio policy: fix in call audio setup delay"
Eric Laurent [Mon, 11 Feb 2013 20:35:42 +0000 (12:35 -0800)]
audio policy: fix in call audio setup delay
There is a delay inserted by audio policy manager before switching
device when entering in call mode to allow music playback to be muted
before the device actually switches.
This delay can be significant when high latency outputs (e.g. deep buffers) are
present and should not be applied if the output is not active.
Issue
7612431.
Change-Id: I04b666769033dbfdc861752b030d3f7bdffe9435
Jean-Michel Trivi [Tue, 5 Feb 2013 00:28:31 +0000 (16:28 -0800)]
Identify remote stream activity, used for notification routing
Add support for checking remote stream activity.
Don't route notifications like media when media active remotely.
Add remote stream activity query in audio policy HAL.
Bug
7485803
Change-Id: Ifb722c7f9ffbfbdc877fec5156bcfc09bec40651
Eric Laurent [Fri, 18 Jan 2013 01:27:26 +0000 (17:27 -0800)]
audio policy: added front + back mic
Added definition to parse front + back mic from input descriptors
in audio_policy.conf file.
Change-Id: I9ebdeac664e12104589a52d15acbbfc4db787923
Eric Laurent [Thu, 8 Nov 2012 23:59:48 +0000 (15:59 -0800)]
am
8d674a4b: (-s ours) am
85f8faa6: am
a7c17deb: audio policy: notification delay - DO NOT MERGE
* commit '
8d674a4b6f4300df90415889c2f57fe8b383e867':
audio policy: notification delay - DO NOT MERGE
Eric Laurent [Thu, 8 Nov 2012 23:59:47 +0000 (15:59 -0800)]
am
2fbecbad: (-s ours) am
8d8ad2ec: am
fe43d163: audio policy: fix volume problem - DO NOT MERGE
* commit '
2fbecbad88f0c6298c35a5bc1bf87aa244059754':
audio policy: fix volume problem - DO NOT MERGE
John Grossman [Thu, 8 Nov 2012 23:59:46 +0000 (15:59 -0800)]
am
8254f4b2: (-s ours) am
503d13af: am
da06cb61: audio policy: fix dynamic parameter - DO NOT MERGE
* commit '
8254f4b244a1f5d65054831d2b0afe53c67c3898':
audio policy: fix dynamic parameter - DO NOT MERGE
Jason Simmons [Thu, 8 Nov 2012 23:59:45 +0000 (15:59 -0800)]
am
81e6a2e0: (-s ours) am
77514217: am
e912bfd7: audio policy: direct output fix - DO NOT MERGE
* commit '
81e6a2e099546f4580253d2b0262d43f2a4090aa':
audio policy: direct output fix - DO NOT MERGE
Eric Laurent [Thu, 8 Nov 2012 23:48:01 +0000 (15:48 -0800)]
am
85f8faa6: am
a7c17deb: audio policy: notification delay - DO NOT MERGE
* commit '
85f8faa65754011161f40b2047fa19a6128ba88c':
audio policy: notification delay - DO NOT MERGE
Eric Laurent [Thu, 8 Nov 2012 23:48:00 +0000 (15:48 -0800)]
am
8d8ad2ec: am
fe43d163: audio policy: fix volume problem - DO NOT MERGE
* commit '
8d8ad2ec94dfab5555dbac71c8d5fe8d1cde0cea':
audio policy: fix volume problem - DO NOT MERGE
John Grossman [Thu, 8 Nov 2012 23:45:09 +0000 (15:45 -0800)]
am
503d13af: am
da06cb61: audio policy: fix dynamic parameter - DO NOT MERGE
* commit '
503d13af915529f78312c6cd3fc951923c45f4f2':
audio policy: fix dynamic parameter - DO NOT MERGE
Jason Simmons [Thu, 8 Nov 2012 23:45:09 +0000 (15:45 -0800)]
am
77514217: am
e912bfd7: audio policy: direct output fix - DO NOT MERGE
* commit '
77514217215c1b7872ece94dc9d3ceef62cdefbb':
audio policy: direct output fix - DO NOT MERGE
Eric Laurent [Thu, 8 Nov 2012 22:35:56 +0000 (14:35 -0800)]
am
a7c17deb: audio policy: notification delay - DO NOT MERGE
* commit '
a7c17deb32fe28230b77b0dff17bb113088a5c16':
audio policy: notification delay - DO NOT MERGE
Eric Laurent [Thu, 8 Nov 2012 22:35:56 +0000 (14:35 -0800)]
am
fe43d163: audio policy: fix volume problem - DO NOT MERGE
* commit '
fe43d163d6646a175934f0752fa05e3e53e89da4':
audio policy: fix volume problem - DO NOT MERGE
John Grossman [Thu, 8 Nov 2012 18:09:04 +0000 (10:09 -0800)]
am
da06cb61: audio policy: fix dynamic parameter - DO NOT MERGE
* commit '
da06cb6142faa3e09cbf7226ca9c75e45661095b':
audio policy: fix dynamic parameter - DO NOT MERGE
Jason Simmons [Thu, 8 Nov 2012 18:06:35 +0000 (10:06 -0800)]
am
e912bfd7: audio policy: direct output fix - DO NOT MERGE
* commit '
e912bfd79880ea5faac0fbcdb4e696125e151e18':
audio policy: direct output fix - DO NOT MERGE
Eric Laurent [Wed, 7 Nov 2012 20:09:54 +0000 (12:09 -0800)]
audio policy: notification delay - DO NOT MERGE
merge from master:
"audio policy: fix notification start delay
The mechanism delaying notifications in case of
muliple active outputs with long latencies must
take into account recently paused audio tracks.
Bug
7400428."
Change-Id: I4ac9dfac81336e33f475b4f28df82713707d0c46
Eric Laurent [Thu, 8 Nov 2012 17:43:15 +0000 (09:43 -0800)]
Merge "audio policy: fix notification start delay"
Eric Laurent [Tue, 30 Oct 2012 23:14:04 +0000 (16:14 -0700)]
audio policy: fix volume problem - DO NOT MERGE
merge from master:
"audio policy: fix volume change when disabling SCO
commit
76e97d39 introduced a regression by having setDeviceConnectionState()
force a device change on duplicated outputs even if the selected device is 0.
This also forces a device 0 for the two outputs it is duplicated to,
which may override a valid device selection on those outputs and apply
default volumes.
Bug
7429869."
Change-Id: I37dd66343c54eb27e420089edbda04444fa1e2c6
John Grossman [Tue, 30 Oct 2012 01:42:43 +0000 (18:42 -0700)]
audio policy: fix dynamic parameter - DO NOT MERGE
merge from master:
"Fix a parse error in checkOutputForDevice
Fix a small parsing error in parsing the supported formats and sample
rates of a stream out with dynamic values for these parameters. The
channel mask parser was properly skipping the "=" in the setting
string, but formats and sample rates were not (cauing the first
reported format and sample rate to end up being skipped)"
Change-Id: Id227a44f6b5fc0c223f2ce74f94ebb6abc5fa77d
Signed-off-by: John Grossman <johngro@google.com>
Jason Simmons [Wed, 31 Oct 2012 17:50:12 +0000 (10:50 -0700)]
audio policy: direct output fix - DO NOT MERGE
merge "Close a newly opened direct output if its parameters are invalid"
from master
Change-Id: I27ac015217480a854d25273ab9498949971b411a
Irfan Sheriff [Thu, 8 Nov 2012 14:18:53 +0000 (06:18 -0800)]
am
b1e73538: am
7fcf81e3: am
745e7fd4: Fix stop supplicant api
* commit '
b1e73538da3e719f404ca014c48fd8dddf81c141':
Fix stop supplicant api
Jason Simmons [Thu, 8 Nov 2012 14:18:52 +0000 (06:18 -0800)]
am
c8bc2286: am
7aab5b0f: Merge "Close a newly opened direct output if its parameters are invalid" into jb-mr1-aah-dev
* commit '
c8bc22869096ee413717102d3f5d0ca804cc3174':
Close a newly opened direct output if its parameters are invalid
Irfan Sheriff [Thu, 8 Nov 2012 14:14:28 +0000 (06:14 -0800)]
am
7fcf81e3: am
745e7fd4: Fix stop supplicant api
* commit '
7fcf81e3a4ac036f23d818d9d5a8eba4387b9b96':
Fix stop supplicant api
Jason Simmons [Thu, 8 Nov 2012 14:12:35 +0000 (06:12 -0800)]
am
7aab5b0f: Merge "Close a newly opened direct output if its parameters are invalid" into jb-mr1-aah-dev
* commit '
7aab5b0f27b9567d077cc6c01807811027066619':
Close a newly opened direct output if its parameters are invalid
Eric Laurent [Wed, 7 Nov 2012 20:09:54 +0000 (12:09 -0800)]
audio policy: fix notification start delay
The mechanism delaying notifications in case of
muliple active outputs with long latencies must
take into account recently paused audio tracks.
Bug
7400428.
Change-Id: I4ac9dfac81336e33f475b4f28df82713707d0c46
Irfan Sheriff [Wed, 7 Nov 2012 01:41:35 +0000 (17:41 -0800)]
am
745e7fd4: Fix stop supplicant api
* commit '
745e7fd4e09db2b47371338ee54c54255e286473':
Fix stop supplicant api
Irfan Sheriff [Sun, 4 Nov 2012 06:21:39 +0000 (23:21 -0700)]
Fix stop supplicant api
Bug:
7227463
Change-Id: I4576e223c69dd67bd714fefecf0a1047770362fd
Jason Simmons [Tue, 6 Nov 2012 21:23:13 +0000 (13:23 -0800)]
Merge "Close a newly opened direct output if its parameters are invalid" into jb-mr1-aah-dev
The Android Open Source Project [Tue, 6 Nov 2012 20:31:23 +0000 (12:31 -0800)]
am
fd1523d7: (-s ours) am
ebed8a53: am
62fcb215: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '
fd1523d782fcf402b5ee033d4134d8601d31c6c9':
The Android Open Source Project [Tue, 6 Nov 2012 20:27:01 +0000 (12:27 -0800)]
am
ebed8a53: am
62fcb215: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '
ebed8a53cca62d19d13ec2381c7e0f4acf1ba302':
The Android Open Source Project [Tue, 6 Nov 2012 20:20:39 +0000 (12:20 -0800)]
am
62fcb215: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '
62fcb21577ccdd68dddd6b6984ad0ce58ee0c228':
The Android Open Source Project [Tue, 6 Nov 2012 20:17:42 +0000 (12:17 -0800)]
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: Ia0e74b5de81f7a112a2e4d829111c6cc7d937617