merge in jb-mr1-factory-release history after reset to jb-mr1-dev
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: Ia0e74b5de81f7a112a2e4d829111c6cc7d937617
Fix stop supplicant api

Bug: 7227463
Change-Id: I4576e223c69dd67bd714fefecf0a1047770362fd
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
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>
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
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
wifi: support adding p2p0 when starting wpa_supplicant

For TI wlan chips in p2p mode we need this omapzoom cherry-pick
to start p2p0 correctly.

http://www.omapzoom.org/?p=platform/hardware/libhardware_legacy.git;a=commit;h=ccb4c24db795059f1df365d313d80c6b269bc55e
By: Arik Nemtsov <arik@wizery.com>
On: Tue, 31 Jul 2012 21:21:20

Original commit description:
Add p2p0 using an NL80211 command when wpa_supplicant is started, and
p2p_supported is enabled.

Change-Id: Ibc0ad138513f024672642cc5764a81510aa38625
Signed-off-by: Hashcode <hashcode0f@gmail.com>
wifi.c: allow devices to specify driver delay

This is necessary on the Samsung smdk4210 tablets. Without
the delay, it takes roughly 30 seconds to enable wifi.

Change-Id: I6a3419e66958fc72ae60e5294f52124b1180d752
wifi: Add support for AP module args

 * Needed for Samsung's goofy handling of AP mode

Change-Id: I5ec65460b7c9f8ef34170473cf1bdaa36587767b
wifi: fix samsung wifi logic

Change-Id: Ib065c0dffa1265a17f5e4fd6ec0b0ad36bbc7b14
audio_policy: Fix volumes for ICS blob compat

Allow usage of the default audio_policy source, even if the primary
audio HAL is an ICS binary blob

Change-Id: I959a925f458e14380c2e5443b1378c4018d9f084
Merge "audio_policy: Fix volumes for ICS blob compat" into cm-10.1
audio: Add support for QCOM audio devices, formats, and channels

- Add QCOM supported devices, fomats, and input/output
  channels in AudioPolicyManagerBase
- Add QCOM supported devices in AudioSystemLegacy.h

Change-Id: I5e2977a630c2bf9211af62d97ae024c5c57075f9

libhardware_legacy: Add support for DirectTrack

- Add support for DirectOutput in libhardware_legacy
- Add new APIs to AudioStreamOut base class
- Add audio output flags to openOutputStream

Change-Id: I301b3b9b2c2ad08dba75f616008d692e825af96f

audio: add missing QCOM audio devices, formats, and channels

- Add support for FM I/O devices and communication device for VOIP
- Add support for mp2 audio format
- Add support for 6.1 audio channels

Change-Id: I7b3042902c658dc8e5dfa34719fb80d18f3ff4e7

libhardware_legacy: Support LPA Playback

Add support to enable Playback in LPA mode

When Alarm is playing on headset+spkr, if LPA
playback is selected STARTEGY_MEDIA gets selected
and switches device from Combo device to Headset.
- Fix the issue by selecting Combo device only
even incase of LPA when stream ALARM/NOTIFICATION
is active.

Change-Id: Ifde78a744a17ce613eac92b4c3bcf875167aaeb6

Add ifdefs for QCOM enhanced features

Change-Id: I87ce3503ed85458c775d0c8c7fa649d8194e28e3
audio policy :Added EVRC and QCELP for 7x30 HAL compilation

Change-Id: I46ac52fa5e04edf1d55302f3868427fa35b378d7
STE_FMRDIO:enable STE_FM radio

Change-Id: I77ff268d37f0359c45600132281d5620c7c2d61d
Merge branch 'android-4.2.2_r1' into jb-mr1
wifi: fix samsung wifi logic

Change-Id: Ib065c0dffa1265a17f5e4fd6ec0b0ad36bbc7b14