am 87ed1979: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit '87ed1979a2429a465e931ff303d9d53cf93a32ae':
am f1761254: am abc55c69: AudioPolicyManager supports querying active record sources

* commit 'f1761254147f61f503d0de1627d9c06b40ef861f':
  AudioPolicyManager supports querying active record sources
am d612ec14: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'd612ec14226d082d246d8448637d15888733a8b9':
am 0e448d32: (-s ours) Reconcile with jb-mr1-factory-release - do not merge

* commit '0e448d3233af3c1cd9b12b38e9c5c88f57c5944f':
am 605ca505: am c4c58b24: Merge "Fix native crash" into jb-mr1-dev

* commit '605ca505f43f4e21f6caed855d0c761b8bc2f6d1':
  Fix native crash
am 8280f934: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit '8280f93403bfd5d5e24ebfb969f22e2e5d36f85e':
am a1084207: am b707cf22: Merge "Remote audio submix always has priority for media, only plays media" into jb-mr1-dev

* commit 'a1084207a76773319d46cfc1ea7376245b0dd1f3':
  Remote audio submix always has priority for media, only plays media
am d4165152: am 85ad78f2: Initialize mStrategyMutedByDevice

* commit 'd41651524bb3d2b9aceec253c0a2e2c5033fee2b':
  Initialize mStrategyMutedByDevice
am d6745071: am aac67317: Merge "audio policy: do not route in call audio to HDMI" into jb-mr1-dev

* commit 'd6745071c1237bbc6f341d8a1df3ca33038869de':
  audio policy: do not route in call audio to HDMI
am 8ec910e0: am 77268631: audio policy: update output delayMs in setPhoneState

* commit '8ec910e02008177844169c423c2aec42046440b7':
  audio policy: update output delayMs in setPhoneState
am d22bb8f4: am 672e9ace: Merge "audio policy: tune voice/video chat volumes" into jb-mr1-dev

* commit 'd22bb8f46c5e3699949c7c54cc61e994979cd6e9':
  audio policy: tune voice/video chat volumes
am 79a4e2ef: am 89ef58f4: Merge "audio policy: fix scanning of supported devices" into jb-mr1-dev

* commit '79a4e2efc502979c21ebbc164691d61b1634362a':
  audio policy: fix scanning of supported devices
am 6d4af736: am 06eda4e2: Merge "Fix native crash when driver commands time out" into jb-mr1-dev

* commit '6d4af736d09fcc7165d3e36bc86b7292d76ad1a4':
  Fix native crash when driver commands time out
am 92be42eb: am 5a484b75: audio policy: active analog dock force usage

* commit '92be42ebb9a62876a003b712ddd2968dde2d6476':
  audio policy: active analog dock force usage
am 9405f9be: am 5debe925: Fix a parse error in checkOutputForDevice

* commit '9405f9be547e55fa6704660130a0d3489186f91a':
  Fix a parse error in checkOutputForDevice
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
am cc8fedd3: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'cc8fedd302110af6bd1cc3aa8268639ca64a9c46':
am fd1523d7: (-s ours) am ebed8a53: am 62fcb215: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit 'fd1523d782fcf402b5ee033d4134d8601d31c6c9':
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
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