summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Camera: setup vendor tags before get_camera_info" into mnc-dr-devYin-Chia Yeh2015-10-151-6/+7
|\
| * Camera: setup vendor tags before get_camera_infoYin-Chia Yeh2015-10-141-6/+7
| | | | | | | | | | | | | | So HAL can use vendor tags on first get_camera_info call. Bug: 24913201 Change-Id: I73f17de87e3712a27f9cee366995df27a740f5cb
* | Merge "audio policy: fix USB mic selection for VoIP" into mnc-dr-devEric Laurent2015-10-151-2/+8
|\ \
| * | audio policy: fix USB mic selection for VoIPEric Laurent2015-10-151-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | When transitioning from speaker phone to normal mode and a USB headset is connected, we must force a teardown of active input as the new input device cannot be reached via current input stream. Bug: 24406915. Change-Id: I9f7c1d3f3cba285c25a6da1d54a3d15a5c1f378a
* | | Merge "SoundTrigger: fix binder call status reporting." into mnc-dr-devChris Thornton2015-10-152-8/+13
|\ \ \
| * | | SoundTrigger: fix binder call status reporting.Eric Laurent2015-10-052-8/+13
| | | | | | | | | | | | | | | | | | | | Bug: 24677430. Change-Id: Ife9b10e2d1acdb51099b21551e8c191fff7f75b4
* | | | Merge "Camera: Add video recording stop sound" into mnc-dr-devChien-Yu Chen2015-10-144-8/+10
|\ \ \ \
| * | | | Camera: Add video recording stop soundChien-Yu Chen2015-10-144-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add video recording stop sound to match MediaActionSound. Bug: 24745252 Change-Id: I84b69757c7e0a98abfaafcce5f41dd45fd41cf74
* | | | | am 7b806481: am f30d7e0a: (-s ours) am ce8029c0: am f5bff8c9: am 7d8bb7a7: ↵Glenn Kasten2015-10-140-0/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 56d193ac: am 5a018d15: (-s ours) am 0f21a688: Merge "DO NOT MERGE - AudioFlinger: Clear record buffers when starting RecordThread" into klp-dev * commit '7b80648180feaad1e7edaecd078246f5002a8fb6': DO NOT MERGE - AudioFlinger: Clear record buffers when starting RecordThread
| * \ \ \ \ am f30d7e0a: (-s ours) am ce8029c0: am f5bff8c9: am 7d8bb7a7: am 56d193ac: ↵Glenn Kasten2015-10-140-0/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 5a018d15: (-s ours) am 0f21a688: Merge "DO NOT MERGE - AudioFlinger: Clear record buffers when starting RecordThread" into klp-dev * commit 'f30d7e0acc573b58333c3c704c2a46eda1dbfcff': DO NOT MERGE - AudioFlinger: Clear record buffers when starting RecordThread
| | * \ \ \ \ am ce8029c0: am f5bff8c9: am 7d8bb7a7: am 56d193ac: am 5a018d15: (-s ours) ↵Glenn Kasten2015-10-140-0/+0
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 0f21a688: Merge "DO NOT MERGE - AudioFlinger: Clear record buffers when starting RecordThread" into klp-dev * commit 'ce8029c09d066d5b9105cfa3cc7d96a97a6c18ea': DO NOT MERGE - AudioFlinger: Clear record buffers when starting RecordThread
| | | * \ \ \ \ am f5bff8c9: am 7d8bb7a7: am 56d193ac: am 5a018d15: (-s ours) am 0f21a688: ↵Glenn Kasten2015-10-140-0/+0
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "DO NOT MERGE - AudioFlinger: Clear record buffers when starting RecordThread" into klp-dev * commit 'f5bff8c9df4444ca91a14ba26cfe005f9f100250': DO NOT MERGE - AudioFlinger: Clear record buffers when starting RecordThread
| | | | * \ \ \ \ am 7d8bb7a7: am 56d193ac: am 5a018d15: (-s ours) am 0f21a688: Merge "DO NOT ↵Glenn Kasten2015-10-140-0/+0
| | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE - AudioFlinger: Clear record buffers when starting RecordThread" into klp-dev * commit '7d8bb7a7f985658ca0cfcd7d6bd05d20ad3a084e': DO NOT MERGE - AudioFlinger: Clear record buffers when starting RecordThread
| | | | | * \ \ \ \ am 56d193ac: am 5a018d15: (-s ours) am 0f21a688: Merge "DO NOT MERGE - ↵Glenn Kasten2015-10-140-0/+0
| | | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AudioFlinger: Clear record buffers when starting RecordThread" into klp-dev * commit '56d193acbec3c387a9d479df003b41362bcf3644': DO NOT MERGE - AudioFlinger: Clear record buffers when starting RecordThread
| | | | | | * \ \ \ \ am 5a018d15: (-s ours) am 0f21a688: Merge "DO NOT MERGE - AudioFlinger: ↵Glenn Kasten2015-10-140-0/+0
| | | | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clear record buffers when starting RecordThread" into klp-dev * commit '5a018d15da438933c30de4b25bcff527331cf8df': DO NOT MERGE - AudioFlinger: Clear record buffers when starting RecordThread
| | | | | | | * \ \ \ \ am 0f21a688: Merge "DO NOT MERGE - AudioFlinger: Clear record buffers when ↵Glenn Kasten2015-10-141-0/+1
| | | | | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | starting RecordThread" into klp-dev * commit '0f21a6880e74b56834940a131df912a49b70e82d': DO NOT MERGE - AudioFlinger: Clear record buffers when starting RecordThread
| | | | | | | | * \ \ \ \ Merge "DO NOT MERGE - AudioFlinger: Clear record buffers when starting ↵Glenn Kasten2015-10-141-0/+1
| | | | | | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RecordThread" into klp-dev
| | | | | | | | | * | | | | DO NOT MERGE - AudioFlinger: Clear record buffers when starting RecordThreadAndy Hung2015-09-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 24211743 Bug: 24267152 Change-Id: I58c55e56b85067b71e4e300f947b4dfc159637ba
* | | | | | | | | | | | | | am 5d805eca: am 77ab176a: (-s ours) am 149fc59e: am 1f42a6cc: am c57ad1ed: ↵Glenn Kasten2015-10-140-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 55d1ea47: Merge "DO NOT MERGE - AudioFlinger: Clear record buffers when starting RecordThread" into lmp-dev * commit '5d805ecad8d8a3ea4f05a2fb9c835b4cb35ea764': DO NOT MERGE - AudioFlinger: Clear record buffers when starting RecordThread
| * | | | | | | | | | | | | am 77ab176a: (-s ours) am 149fc59e: am 1f42a6cc: am c57ad1ed: am 55d1ea47: ↵Glenn Kasten2015-10-140-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "DO NOT MERGE - AudioFlinger: Clear record buffers when starting RecordThread" into lmp-dev * commit '77ab176ae7c9158be47c993bc5d7a54b997a15e9': DO NOT MERGE - AudioFlinger: Clear record buffers when starting RecordThread
| | * | | | | | | | | | | | am 149fc59e: am 1f42a6cc: am c57ad1ed: am 55d1ea47: Merge "DO NOT MERGE - ↵Glenn Kasten2015-10-142-1/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AudioFlinger: Clear record buffers when starting RecordThread" into lmp-dev * commit '149fc59ee66ee84c02e3c705e6264213ab4401a7': DO NOT MERGE - AudioFlinger: Clear record buffers when starting RecordThread
| | | * | | | | | | | | | | am 1f42a6cc: am c57ad1ed: am 55d1ea47: Merge "DO NOT MERGE - AudioFlinger: ↵Glenn Kasten2015-10-142-1/+4
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clear record buffers when starting RecordThread" into lmp-dev * commit '1f42a6cc1edd96030478a8bc1e05a0ff7710e539': DO NOT MERGE - AudioFlinger: Clear record buffers when starting RecordThread
| | | | * | | | | | | | | | am c57ad1ed: am 55d1ea47: Merge "DO NOT MERGE - AudioFlinger: Clear record ↵Glenn Kasten2015-10-142-1/+4
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | buffers when starting RecordThread" into lmp-dev * commit 'c57ad1ed177ab58ae759a5054d8a14a306715f85': DO NOT MERGE - AudioFlinger: Clear record buffers when starting RecordThread
| | | | | * | | | | | | | | am 55d1ea47: Merge "DO NOT MERGE - AudioFlinger: Clear record buffers when ↵Glenn Kasten2015-10-142-1/+4
| | | | | |\ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | starting RecordThread" into lmp-dev * commit '55d1ea47c8aac1d5c6e887e06e8c36bf40eca7d7': DO NOT MERGE - AudioFlinger: Clear record buffers when starting RecordThread
| | | | | | * | | | | | | | Merge "DO NOT MERGE - AudioFlinger: Clear record buffers when starting ↵Glenn Kasten2015-10-142-1/+4
| | | | | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RecordThread" into lmp-dev
| | | | | | | * | | | | | | | DO NOT MERGE - AudioFlinger: Clear record buffers when starting RecordThreadAndy Hung2015-09-242-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 24211743 Bug: 24267152 Change-Id: I58c55e56b85067b71e4e300f947b4dfc159637ba
* | | | | | | | | | | | | | | Merge "DO NOT MERGE: Fix setTorchMode support for the old HAL version" into ↵Chien-Yu Chen2015-10-141-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dr-dev
| * | | | | | | | | | | | | | DO NOT MERGE: Fix setTorchMode support for the old HAL versionOleksiy Avramchenko2015-10-141-0/+1
| | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CameraHardwareInterfaceFlashControl class calls disconnectCameraDevice when torch is disabled. This closes connection to the camera module, but mDevice instance is kept and variable is non-NULL which will prevent connection next time torch is going to be enabled. Bug: 24909924 Change-Id: Icb1ffb07f05256afd92821f0f4908cda5332c05b
* | | | | | | | | | | | | | Merge "audioflinger: increase shared memory heap size" into mnc-dr-devEric Laurent2015-10-142-4/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | audioflinger: increase shared memory heap sizeEric Laurent2015-10-142-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 21093153. Change-Id: I389af11451b01ce49fdb8957e2f322ba1925a62e (cherry picked from commit da73b6c7474aaa5616f0214e238776f12717f32b)
* | | | | | | | | | | | | | | Merge "NuPlayerDecoder: report error in case of audio sink open error." into ↵Eric Laurent2015-10-141-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dr-dev
| * | | | | | | | | | | | | | | NuPlayerDecoder: report error in case of audio sink open error.Eric Laurent2015-10-141-1/+4
| |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 21093153. Change-Id: I77e03a620b43967991dcee9d6ca01f67c8b7a02e (cherry picked from commit 15ce09dddf830d6a6ca097c5ec0a7ec7c35b6b3a)
* | | | | | | | | | | | | | | Merge "For static obtainBuffer(), do not set mUnreleased if acknowledging ↵Glenn Kasten2015-10-142-2/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | flush." into mnc-dr-dev
| * | | | | | | | | | | | | | For static obtainBuffer(), do not set mUnreleased if acknowledging flush.Andy Hung2015-10-132-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | static audio tracks use obtainBuffer() to update position in start(). Bug: 22938515 Change-Id: I8ae32f6cce4d122386d2cf8982e158049b04ba9a
* | | | | | | | | | | | | | | Merge "NuPlayerRenderer: do not send rendering started message when paused" ↵Glenn Kasten2015-10-142-1/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mnc-dr-dev
| * | | | | | | | | | | | | | | NuPlayerRenderer: do not send rendering started message when pausedAndy Hung2015-10-132-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delay until resume. Bug: 23669269 Change-Id: I0a805812d80b1aad561425442bca0fc05a05752f
* | | | | | | | | | | | | | | | Merge "AudioTrack: Skip callback EVENT_STREAM_END on DEAD_OBJECT." into ↵Glenn Kasten2015-10-141-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dr-dev
| * | | | | | | | | | | | | | | AudioTrack: Skip callback EVENT_STREAM_END on DEAD_OBJECT.Andy Hung2015-10-131-1/+5
| |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Send only EVENT_NEW_IAUDIOTRACK to initiate teardown. Bug: 23750452 Change-Id: Ib5dcd578b5b6a6a1d91a03e58ef8da0acd994243
* | | | | | | | | | | | | | | Merge "Don't send OnCompletion events when looping" into mnc-dr-devMarco Nelissen2015-10-131-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Don't send OnCompletion events when loopingMarco Nelissen2015-10-131-1/+2
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AwesomePlayer never did, and neither should NuPlayer. Bug: 18656047 Change-Id: Ia9abe42cfe6ea643633cec859e9da770092569bb
* | | | | | | | | | | | | | | NuPlayer: reset mAudioEOS and mVideoEOS when renderer is flushed.Wei Jia2015-10-131-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 24749881 Change-Id: I0d3a757262446ac702dfebd464d5e59f1a98eba8 (cherry picked from commit 3261f0db54e31e652af9bd3b76a8e85174f5ee87)
* | | | | | | | | | | | | | | Merge "NuPlayerDriver: acquire mLock when needed." into mnc-dr-devWei Jia2015-10-131-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | NuPlayerDriver: acquire mLock when needed.Wei Jia2015-10-131-1/+1
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 24338126 Change-Id: Ic55d1a551c18255423423079b6c2bf045dea6e44 (cherry picked from commit f3631d2921ee0738f87427848e38873370ef9ec0)
* | | | | | | | | | | | | | | Merge "NuPlayerRenderer: always update MediaClock with max media duration." ↵Wei Jia2015-10-131-9/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mnc-dr-dev
| * | | | | | | | | | | | | | NuPlayerRenderer: always update MediaClock with max media duration.Wei Jia2015-10-131-9/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 24345295 Change-Id: I868c9c44ea22de98a083432262e485d0f134203f (cherry picked from commit d005c5ddb4842369979df7b76f1d0f5f1380fcd9)
* | | | | | | | | | | | | | | Merge "libstagefright: don't reclaim codec when there's buffer owned by ↵Ronghua Wu2015-10-132-2/+45
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | client. Notify the client and try to reclaim again in 0.5s." into mnc-dr-dev
| * | | | | | | | | | | | | | libstagefright: don't reclaim codec when there's buffer ownedRonghua Wu2015-10-052-2/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | by client. Notify the client and try to reclaim again in 0.5s. Bug: 23703241 Bug: 23949540 Change-Id: I1afe50c71635645668bfb73ffa0d801765b5ae3c
* | | | | | | | | | | | | | | am 136ea31a: am 602343bb: am 480f0ca9: am 9d1bc9f2: resolved conflicts for ↵Andy Hung2015-10-130-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4beea277 to lmp-mr1-dev * commit '136ea31a7a988e17ec9f2d4f4f3bcfe427683362': DO NOT MERGE - audio policy: fix commit dea1541f
| * | | | | | | | | | | | | | am 602343bb: am 480f0ca9: am 9d1bc9f2: resolved conflicts for 4beea277 to ↵Andy Hung2015-10-130-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit '602343bb7c64bec625a17e2a825e4d2b50f359fe': DO NOT MERGE - audio policy: fix commit dea1541f
| | * | | | | | | | | | | | | am 480f0ca9: am 9d1bc9f2: resolved conflicts for 4beea277 to lmp-mr1-devAndy Hung2015-10-130-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '480f0ca9c314d880aba07b583c5e9d05d3639ed5': DO NOT MERGE - audio policy: fix commit dea1541f