summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | am 0378676b: am 92990810: am b1231923: am e550d213: am f70b69a8: Merge "stage...Lajos Molnar2015-10-191-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| / / / / / / / / / / | | |/ / / / / / / / / /
| | * | | | | | | | | | am 92990810: am b1231923: am e550d213: am f70b69a8: Merge "stagefright: check...Lajos Molnar2015-10-191-0/+4
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | am b1231923: am e550d213: am f70b69a8: Merge "stagefright: check bounds for M...Lajos Molnar2015-10-191-0/+4
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / /
| | | | * | | | | | | | am e550d213: am f70b69a8: Merge "stagefright: check bounds for MediaCodecList...Lajos Molnar2015-10-191-0/+4
| | | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / /
| | | | | * | | | | | | am f70b69a8: Merge "stagefright: check bounds for MediaCodecList.getCodecInfo...Lajos Molnar2015-10-191-0/+4
| | | | | |\ \ \ \ \ \ \ | | | | | | |/ / / / / /
| | | | | | * | | | | | 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
* | | | | | | | | | | | | libcameraservice: Fix ALOG prints in FlashLight.Ranjith Kagathi Ananda2015-10-161-4/+8
* | | | | | | | | | | | | Camera: frameworks: Add NULL check for callbackRanjith Kagathi Ananda2015-10-161-1/+5
| |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
* | | | | | | | | | | | Reconcile with master after mass cherrypicksMarco Nelissen2015-10-161-0/+1
* | | | | | | | | | | | Merge "SoftAVCDec: Exit gracefully when memory allocation fails in the decode...Marco Nelissen2015-10-161-0/+11
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | SoftAVCDec: Exit gracefully when memory allocation fails in the decoderHarish Mahendrakar2015-10-161-0/+11
* | | | | | | | | | | | | 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
* | | | | | | | | | | | | SoftHEVCDec: Reduced memory requirementsHarish Mahendrakar2015-10-162-248/+98
|/ / / / / / / / / / / /
* | | | | | | | | | | | SoftMPEG2Dec: Added support for deinterlacerHarish Mahendrakar2015-10-161-1/+2
* | | | | | | | | | | | Merge "audio policy: fix transition from VoIP to voice call on USB" into mnc-...Eric Laurent2015-10-151-0/+23
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
| * | | | | | | | | | | audio policy: fix transition from VoIP to voice call on USBEric Laurent2015-10-151-0/+23
* | | | | | | | | | | | 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
* | | | | | | | | | | | 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
* | | | | | | | | | | | | 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
* | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | am 7b806481: am f30d7e0a: (-s ours) am ce8029c0: am f5bff8c9: am 7d8bb7a7: am...Glenn Kasten2015-10-140-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | am f30d7e0a: (-s ours) am ce8029c0: am f5bff8c9: am 7d8bb7a7: am 56d193ac: am...Glenn Kasten2015-10-140-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | am ce8029c0: am f5bff8c9: am 7d8bb7a7: am 56d193ac: am 5a018d15: (-s ours) am...Glenn Kasten2015-10-140-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / / / | | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | | am f5bff8c9: am 7d8bb7a7: am 56d193ac: am 5a018d15: (-s ours) am 0f21a688: Me...Glenn Kasten2015-10-140-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|/ / / / / / / | | | | |/| | | | | | | | | |
| | | | * | | | | | | | | | | am 7d8bb7a7: am 56d193ac: am 5a018d15: (-s ours) am 0f21a688: Merge "DO NOT M...Glenn Kasten2015-10-140-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|/ / / / / / | | | | | |/| | | | | | | | |
| | | | | * | | | | | | | | | am 56d193ac: am 5a018d15: (-s ours) am 0f21a688: Merge "DO NOT MERGE - AudioF...Glenn Kasten2015-10-140-0/+0
| | | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | |_|_|_|/ / / / / | | | | | | |/| | | | | | | |
| | | | | | * | | | | | | | | am 5a018d15: (-s ours) am 0f21a688: Merge "DO NOT MERGE - AudioFlinger: Clear...Glenn Kasten2015-10-140-0/+0
| | | | | | |\ \ \ \ \ \ \ \ \ | | | | | | | | |_|_|_|_|/ / / | | | | | | | |/| | | | | | |
| | | | | | | * | | | | | | | am 0f21a688: Merge "DO NOT MERGE - AudioFlinger: Clear record buffers when st...Glenn Kasten2015-10-141-0/+1
| | | | | | | |\ \ \ \ \ \ \ \ | | | | | | | | | |_|_|_|_|/ / | | | | | | | | |/| | | | | |
| | | | | | | | * | | | | | | Merge "DO NOT MERGE - AudioFlinger: Clear record buffers when starting Record...Glenn Kasten2015-10-141-0/+1
| | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | * | | | | | | DO NOT MERGE - AudioFlinger: Clear record buffers when starting RecordThreadAndy Hung2015-09-241-0/+1
* | | | | | | | | | | | | | | | am 5d805eca: am 77ab176a: (-s ours) am 149fc59e: am 1f42a6cc: am c57ad1ed: am...Glenn Kasten2015-10-140-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | am 77ab176a: (-s ours) am 149fc59e: am 1f42a6cc: am c57ad1ed: am 55d1ea47: Me...Glenn Kasten2015-10-140-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | am 149fc59e: am 1f42a6cc: am c57ad1ed: am 55d1ea47: Merge "DO NOT MERGE - Aud...Glenn Kasten2015-10-142-1/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / /
| | | * | | | | | | | | | | | | am 1f42a6cc: am c57ad1ed: am 55d1ea47: Merge "DO NOT MERGE - AudioFlinger: Cl...Glenn Kasten2015-10-142-1/+4
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / /
| | | | * | | | | | | | | | | | am c57ad1ed: am 55d1ea47: Merge "DO NOT MERGE - AudioFlinger: Clear record bu...Glenn Kasten2015-10-142-1/+4
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / /
| | | | | * | | | | | | | | | | am 55d1ea47: Merge "DO NOT MERGE - AudioFlinger: Clear record buffers when st...Glenn Kasten2015-10-142-1/+4
| | | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / /
| | | | | | * | | | | | | | | | Merge "DO NOT MERGE - AudioFlinger: Clear record buffers when starting Record...Glenn Kasten2015-10-142-1/+4
| | | | | | |\ \ \ \ \ \ \ \ \ \
| | | | | | | * | | | | | | | | | DO NOT MERGE - AudioFlinger: Clear record buffers when starting RecordThreadAndy Hung2015-09-242-1/+4
* | | | | | | | | | | | | | | | | Merge "DO NOT MERGE: Fix setTorchMode support for the old HAL version" into m...Chien-Yu Chen2015-10-141-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | DO NOT MERGE: Fix setTorchMode support for the old HAL versionOleksiy Avramchenko2015-10-141-0/+1
| | |_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | | Merge "NuPlayerDecoder: report error in case of audio sink open error." into ...Eric Laurent2015-10-141-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | NuPlayerDecoder: report error in case of audio sink open error.Eric Laurent2015-10-141-1/+4
| |/ / / / / / / / / / / / / / / /