audio: Fix merge issues

Change-Id: If72942b042ab1cebd1788644954fd13eee028e49
Bluetooth: Security: Handle authentication rejected error status

Handle authentication rejected error status in failure scenario.

Change-Id: Ibd59d161ee5481ced2cb078a6ee6f4a6b045bcd4
CRs-Fixed: 516087
usbaudio: Make the USB audio HAL actually work.

 * Set a default device if none is set.
 * Shush some logging.
 * Only use the mmap interface on QCOM devices.

Change-Id: I790a6733e85b169e645e020fa92608a0d4fea3c2
usbaudio: Provide a way to hardcode the card id

 * Some devices will have secondary sound cards for things like SPDIF.
 * Let's provide a way to hardcode the correct value for now until we
   have framework support for doing this correctly.

Change-Id: I6f3396692f1acc1602491e3a3befea8e04b6c9cf
Merge tag 'android-4.3_r2.2' of https://android.googlesource.com/platform/hardware/libhardware into cm-10.2

Android 4.3 release 2.2

Change-Id: I224a6f5c72e7def81f4c7b89bdaf44bf1a920643
Irda: Added IrDA HAL Library

This HAL is supposed to be generic in the long term, and at the
very least, works on other Samsung devices such as n80xx.

Change-Id: I6521f4b4fd4822381d941a83581d4bce942e41a8
Bluetooth: HID: Add support for Set Idle and Get Idle commands

This patch adds the relevant callback prototyps for Set Idle and
Get Idle which is used for setting idle time on HID devices.

Change-Id: I4c528a510edd847bc6121ce0b875ae313f090b9c
CRs-Fixed: 522511
Bluetooth: Add BT_PROPERTY_REMOTE_TRUST_VALUE in BT property

Add the above property for device trust feature in bluetooth.

Change-Id: Ieab0dd140ac6080551f162a0517552bd469204f2
CRs-fixed: 523135
libhardware: allow all platforms to disable external rotation

Change-Id: Ifa70b4232e5822936074f1272dce5498be471c9d
hwc: Enable orientation event for all targets

 * This is useful all targets, so remove the QCOM ifdef.

Change-Id: I6c1f517b9bc1f11266817883bf2c5ca7c497c5b7
Merge "hwc: Enable orientation event for all targets" into cm-10.2
Added ifndef ICS_AUDIO_BLOB around non-existent functions (1/3)

For older audio blobs where is_source_active and is_stream_active_remotely
doesn't exist, receiving a notification and dumpsys crashes the audio service.

Change-Id: I162fc97fd0051121f1cd3e63832ce5b25d1d218e
usbaudio: fix for out->dev->lock remains locked in error case

-out->dev->lock remains locked in error case in out_write()
-Added pthread_mutex_unlock() in the error case

Change-Id: Ibbbd5ced1f9d469cfba3b33a94414d0b94affa8f
CRs-Fixed: 522054
Bluetooth: Add support for set_priority for HID Host

This patch adds support for set_priority for HID Host. With this new
method, btif layer would be informed of remote HID Device priority
and would help in early rejection of HID incoming connection in case
User on DUT has unchecked Input device from Application.

Change-Id: I0c1ac7c8ad010b8d7e8aa5653e69568a45f4af92
CRs-Fixed: 532234
Bluetooth: Support MAP Client role on Bluedroid.

Implementation of MAP Client (MCE) role on
Bluedroid stack. Include MAP Client Interface ID.

Change-Id: Icdf11b7f09a161e35aa3aa68b9b5fa315e18fd65

CRs-fixed: 539274
Merge "Added ifndef ICS_AUDIO_BLOB around non-existent functions (1/3)" into cm-10.2
usbaudio: Fix output device routing

Fix issue with commit a35e783 causing the output device to reset back
to the hard coded value of CARD_ID after a new output device is
specified.

This happens because out_set_parameters() receives a single "routing"
key/value pair just after setting a new output device. The if/else
statement would then cause a reset of the output device back to CARD_ID
because the "routing" message does not contain a card or device id.

Change-Id: Ib7c7eb7ef675ae371033a7ae7ce73782cac2c898
Bluetooth: Support  HFP Client role on Bluedroid.

Implementation of HFP Client role on
Bluedroid stack. Include HFP Client Interface ID.

Change-Id: Ib440099de75081b2bd8d5f01f4d9d1bb467294ea
Bluetooth: Add Get/Set socket option prototypes

Get/set socket option function prototypes added

Change-Id: Iff7ff159c8cf765416b00ac504fe345492d05088
audio: Support MR1 audio_policy

Change-Id: If9543260bc8fb2d411a119dc62720d632eceec6c