Merge branch 'jb_2.5' of git://codeaurora.org/platform/hardware/qcom/audio into cm-10.1

Change-Id: I7cbe046f187b2486132d375141ba96510d516c32
alsa_sound: Kill LPA logspam

Change-Id: I61e4e0500911865d2a119f552cc97c8bba99c3b8
audio-caf: fix dbg message derp

Change-Id: Id64e7c8fa04cafa57f422558c5aa84a21127b88f
audio: modify the SPEAKER_RX_ACDB to support both MONO and STEREO speaker

Change-Id: Iea7d8d5cdb7b04b347be84343f5bd44caeb51609
alsa_sound: change noisy debug statements to verbose

Change-Id: Iaa1f0603d9efc1b4593c61b0558a2369ac77d7dc
Merge remote-tracking branch 'caf/jb_2.5' into HEAD

Conflicts:
	alsa_sound/ALSADevice.cpp

Change-Id: Ibc60d3694d814a4ad8ad464e95217ccca8b31936
audio: provide a hook for audio amplifier implementations

Example: http://review.cyanogenmod.org/#/c/38221

Change-Id: Ib236598a5888b2af19bcfb81e285f644a0e84c0d
Merge branch 'av-test' of git://github.com/CyanogenMod/android_hardware_qcom_audio-caf into cm-10.1

Change-Id: Ib07512ab88052716106383f321ddaad0e0586fb1
Merge tag 'AU_LINUX_ANDROID_JB_2.5.04.02.02.040.375' of git://codeaurora.org/platform/hardware/qcom/audio into cm-10.1

AU_LINUX_ANDROID_JB_2.5.04.02.02.040.375 based on quic/aosp/jb_2.5
alsa_sound: Fix for short break in music when touch tone plays

-When touch tone plays for the first time while music playback is
going on, a short break in music happens.
-In checkDeviceMuteStrategies whenever there is a change in device
on an output, tempMute is set. However the same tempMute is used to
decide whether to mute an already existing session on a different output
irrespective of the current active device on that output. Due to this
mute and unmute happens even when there is no real change in device on
a particular output which might cause a short break in playback.
-Add check to ensure that active streams are temporarily muted only
in case of a change in device on that particular output.

CRs-Fixed: 495009
Change-Id: Icbc2afa4516f700b170c1f6801135cc5ca61fbfe
alsa-sound: Fix to sound burst on switching from speaker to headset

 -During device switch stream mute(vol 0) for compressed or lpa
  stream is getting applied after the device set for primary output
  because first it check for primary output, set the device then it
  check for lpa or tunnel output and mute the stream.

 -Set the stream mute for other output(LPA or Compressed) followed
  by device setting for lpa or compressed output and then set the
  device for primary output.

CRs-Fixed: 480077

Change-Id: I6bc1ba5d8df766fbbbffaba4d44f14f7a0be666f
msm8660: Fix VoIP device for Samsung Audio

* Add USE_SAMSUNG_VOIP_DEVICE for voip devices
* Added ifdef for MVS include

Change-Id: I57b52cc159eb6ef5cadadf8acacffceaf2bc77aa
msm8660: Fix call/voip audio routing for Samsung audio

Change-Id: I021344b1c4672b2fb92503059b3eaec6121bdc19
alsa_sound: Add support for seperated VOIP devices

 * Similar to the VOC devices tuned for voice calls, some new devices
   are using VOIP devices tuned for SIP and Hangouts.
 * Enable with BOARD_USES_SEPERATED_VOIP

Change-Id: I3a49be26ca2ad3e1aafb8b0960935ac8c735fe51
alsa_sound: Add support for seperated headset mic devices

 * Some recent devices such as the Galaxy S4 use dedicated 3-pole
 * headset mic devices while in-call.
 * This also supports the seperated VOIP headset mic device.
 * Only engage the ES325 dualmic for speaker/earpiece usecases.

Change-Id: I1c0b01a9df70fbb7364ba69004aa7828e3f1f01c
alsa_sound: Add support for VR-on-wired-headset device

Change-Id: Ib206649194794f46480b7f87eaeb9e3fdb0df1b1