summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | | * | | | | | | | | am b1231923: am e550d213: am f70b69a8: Merge "stagefright: check bounds for ↵Lajos Molnar2015-10-191-0/+4
| | | | |\ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MediaCodecList.getCodecInfo" into lmp-dev * commit 'b1231923f134a167a0351091d8944b7583928a4f': stagefright: check bounds for MediaCodecList.getCodecInfo
| | | | | * | | | | | | | am e550d213: am f70b69a8: Merge "stagefright: check bounds for ↵Lajos Molnar2015-10-191-0/+4
| | | | | |\ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MediaCodecList.getCodecInfo" into lmp-dev * commit 'e550d21360287c752fd79a67f1962244ee272be1': stagefright: check bounds for MediaCodecList.getCodecInfo
| | | | | | * | | | | | | am f70b69a8: Merge "stagefright: check bounds for ↵Lajos Molnar2015-10-191-0/+4
| | | | | | |\ \ \ \ \ \ \ | | | | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MediaCodecList.getCodecInfo" into lmp-dev * commit 'f70b69a8b5ed044112516bf69f69905e521070b6': stagefright: check bounds for MediaCodecList.getCodecInfo
| | | | | | | * | | | | | Merge "stagefright: check bounds for MediaCodecList.getCodecInfo" into lmp-devLajos Molnar2015-10-191-0/+4
| | | | | | | |\ \ \ \ \ \
| | | | | | | | * | | | | | stagefright: check bounds for MediaCodecList.getCodecInfoLajos Molnar2015-10-121-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 24445127 Change-Id: I1c6cb9e2518b852d48d5d0d625b54409bd4e13ec
| * | | | | | | | | | | | | libcameraservice: Fix ALOG prints in FlashLight.Ranjith Kagathi Ananda2015-10-161-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing __FUNCTION__ arguments into log statements. Ack by: Dilip Gopalakrishna Bug: 25023187 Change-Id: I0256bad626d490fb9360a73c104afaad7a012a97
| * | | | | | | | | | | | | Camera: frameworks: Add NULL check for callbackRanjith Kagathi Ananda2015-10-161-1/+5
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | --Added NULL check for mRemoteCallback Ack by: Susmitha Gummalla Bug: 25023187 Change-Id: Ib88a128a52e81b8ec1052e3222b6d8b9e494afcc
| * | | | | | | | | | | | Reconcile with master after mass cherrypicksMarco Nelissen2015-10-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I74649c9771212aa6309ea16c253723994b8e3622
| * | | | | | | | | | | | Merge "SoftAVCDec: Exit gracefully when memory allocation fails in the ↵Marco Nelissen2015-10-161-0/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | decoder" into mnc-dr-dev
| | * | | | | | | | | | | | SoftAVCDec: Exit gracefully when memory allocation fails in the decoderHarish Mahendrakar2015-10-161-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib6e16be3f128e4fc97f8f05b794da980341c81cc
| * | | | | | | | | | | | | Merge "SoftAVCDec: Added a check for unsupported resolutions" into mnc-dr-devMarco Nelissen2015-10-161-0/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | SoftAVCDec: Added a check for unsupported resolutionsHarish Mahendrakar2015-10-161-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 24542936 Change-Id: I97203353c7d026e02c8aad0f2c820a641e453c7c
| * | | | | | | | | | | | | SoftHEVCDec: Reduced memory requirementsHarish Mahendrakar2015-10-162-248/+98
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8b5205dd8a149a02f78fb55fc3121daf4e69791a
| * | | | | | | | | | | | SoftMPEG2Dec: Added support for deinterlacerHarish Mahendrakar2015-10-161-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 20932810 Change-Id: I16eadda6f26e73ed89c878d52c38bb43d84bfe40
| * | | | | | | | | | | | Merge "audio policy: fix transition from VoIP to voice call on USB" into ↵Eric Laurent2015-10-151-0/+23
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | mnc-dr-dev
| | * | | | | | | | | | | audio policy: fix transition from VoIP to voice call on USBEric Laurent2015-10-151-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure no active capture takes place while in call and the capture device is the same as the call TX device. Bug: 23977713. Change-Id: Ia379d5e626c150ea49f0cdd581c881dbf0b8399d
| * | | | | | | | | | | | 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