Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge "audio policy: fix USB mic selection for VoIP" into mnc-dr-dev | Eric Laurent | 2015-10-15 | 1 | -2/+8 |
|\ | |||||
| * | audio policy: fix USB mic selection for VoIP | Eric Laurent | 2015-10-15 | 1 | -2/+8 |
* | | Merge "SoundTrigger: fix binder call status reporting." into mnc-dr-dev | Chris Thornton | 2015-10-15 | 2 | -8/+13 |
|\ \ | |||||
| * | | SoundTrigger: fix binder call status reporting. | Eric Laurent | 2015-10-05 | 2 | -8/+13 |
* | | | Merge "Camera: Add video recording stop sound" into mnc-dr-dev | Chien-Yu Chen | 2015-10-14 | 4 | -8/+10 |
|\ \ \ | |||||
| * | | | Camera: Add video recording stop sound | Chien-Yu Chen | 2015-10-14 | 4 | -8/+10 |
* | | | | am 7b806481: am f30d7e0a: (-s ours) am ce8029c0: am f5bff8c9: am 7d8bb7a7: am... | Glenn Kasten | 2015-10-14 | 0 | -0/+0 |
|\ \ \ \ | |||||
| * \ \ \ | am f30d7e0a: (-s ours) am ce8029c0: am f5bff8c9: am 7d8bb7a7: am 56d193ac: am... | Glenn Kasten | 2015-10-14 | 0 | -0/+0 |
| |\ \ \ \ | |||||
| | * \ \ \ | am ce8029c0: am f5bff8c9: am 7d8bb7a7: am 56d193ac: am 5a018d15: (-s ours) am... | Glenn Kasten | 2015-10-14 | 0 | -0/+0 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | am f5bff8c9: am 7d8bb7a7: am 56d193ac: am 5a018d15: (-s ours) am 0f21a688: Me... | Glenn Kasten | 2015-10-14 | 0 | -0/+0 |
| | | |\ \ \ \ | |||||
| | | | * \ \ \ | am 7d8bb7a7: am 56d193ac: am 5a018d15: (-s ours) am 0f21a688: Merge "DO NOT M... | Glenn Kasten | 2015-10-14 | 0 | -0/+0 |
| | | | |\ \ \ \ | |||||
| | | | | * \ \ \ | am 56d193ac: am 5a018d15: (-s ours) am 0f21a688: Merge "DO NOT MERGE - AudioF... | Glenn Kasten | 2015-10-14 | 0 | -0/+0 |
| | | | | |\ \ \ \ | |||||
| | | | | | * \ \ \ | am 5a018d15: (-s ours) am 0f21a688: Merge "DO NOT MERGE - AudioFlinger: Clear... | Glenn Kasten | 2015-10-14 | 0 | -0/+0 |
| | | | | | |\ \ \ \ | |||||
| | | | | | | * \ \ \ | am 0f21a688: Merge "DO NOT MERGE - AudioFlinger: Clear record buffers when st... | Glenn Kasten | 2015-10-14 | 1 | -0/+1 |
| | | | | | | |\ \ \ \ | |||||
| | | | | | | | * \ \ \ | Merge "DO NOT MERGE - AudioFlinger: Clear record buffers when starting Record... | Glenn Kasten | 2015-10-14 | 1 | -0/+1 |
| | | | | | | | |\ \ \ \ | |||||
| | | | | | | | | * | | | | DO NOT MERGE - AudioFlinger: Clear record buffers when starting RecordThread | Andy Hung | 2015-09-24 | 1 | -0/+1 |
* | | | | | | | | | | | | | am 5d805eca: am 77ab176a: (-s ours) am 149fc59e: am 1f42a6cc: am c57ad1ed: am... | Glenn Kasten | 2015-10-14 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | am 77ab176a: (-s ours) am 149fc59e: am 1f42a6cc: am c57ad1ed: am 55d1ea47: Me... | Glenn Kasten | 2015-10-14 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |||||
| | * | | | | | | | | | | | am 149fc59e: am 1f42a6cc: am c57ad1ed: am 55d1ea47: Merge "DO NOT MERGE - Aud... | Glenn Kasten | 2015-10-14 | 2 | -1/+4 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | |||||
| | | * | | | | | | | | | | am 1f42a6cc: am c57ad1ed: am 55d1ea47: Merge "DO NOT MERGE - AudioFlinger: Cl... | Glenn Kasten | 2015-10-14 | 2 | -1/+4 |
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | |||||
| | | | * | | | | | | | | | am c57ad1ed: am 55d1ea47: Merge "DO NOT MERGE - AudioFlinger: Clear record bu... | Glenn Kasten | 2015-10-14 | 2 | -1/+4 |
| | | | |\ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / | |||||
| | | | | * | | | | | | | | am 55d1ea47: Merge "DO NOT MERGE - AudioFlinger: Clear record buffers when st... | Glenn Kasten | 2015-10-14 | 2 | -1/+4 |
| | | | | |\ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / | |||||
| | | | | | * | | | | | | | Merge "DO NOT MERGE - AudioFlinger: Clear record buffers when starting Record... | Glenn Kasten | 2015-10-14 | 2 | -1/+4 |
| | | | | | |\ \ \ \ \ \ \ | |||||
| | | | | | | * | | | | | | | DO NOT MERGE - AudioFlinger: Clear record buffers when starting RecordThread | Andy Hung | 2015-09-24 | 2 | -1/+4 |
* | | | | | | | | | | | | | | Merge "DO NOT MERGE: Fix setTorchMode support for the old HAL version" into m... | Chien-Yu Chen | 2015-10-14 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | DO NOT MERGE: Fix setTorchMode support for the old HAL version | Oleksiy Avramchenko | 2015-10-14 | 1 | -0/+1 |
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | Merge "audioflinger: increase shared memory heap size" into mnc-dr-dev | Eric Laurent | 2015-10-14 | 2 | -4/+14 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | audioflinger: increase shared memory heap size | Eric Laurent | 2015-10-14 | 2 | -4/+14 |
* | | | | | | | | | | | | | | Merge "NuPlayerDecoder: report error in case of audio sink open error." into ... | Eric Laurent | 2015-10-14 | 1 | -1/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | NuPlayerDecoder: report error in case of audio sink open error. | Eric Laurent | 2015-10-14 | 1 | -1/+4 |
| |/ / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | Merge "For static obtainBuffer(), do not set mUnreleased if acknowledging flu... | Glenn Kasten | 2015-10-14 | 2 | -2/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | For static obtainBuffer(), do not set mUnreleased if acknowledging flush. | Andy Hung | 2015-10-13 | 2 | -2/+5 |
* | | | | | | | | | | | | | | Merge "NuPlayerRenderer: do not send rendering started message when paused" i... | Glenn Kasten | 2015-10-14 | 2 | -1/+11 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | NuPlayerRenderer: do not send rendering started message when paused | Andy Hung | 2015-10-13 | 2 | -1/+11 |
* | | | | | | | | | | | | | | | Merge "AudioTrack: Skip callback EVENT_STREAM_END on DEAD_OBJECT." into mnc-d... | Glenn Kasten | 2015-10-14 | 1 | -1/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | AudioTrack: Skip callback EVENT_STREAM_END on DEAD_OBJECT. | Andy Hung | 2015-10-13 | 1 | -1/+5 |
| |/ / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | Merge "Don't send OnCompletion events when looping" into mnc-dr-dev | Marco Nelissen | 2015-10-13 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Don't send OnCompletion events when looping | Marco Nelissen | 2015-10-13 | 1 | -1/+2 |
* | | | | | | | | | | | | | | | NuPlayer: reset mAudioEOS and mVideoEOS when renderer is flushed. | Wei Jia | 2015-10-13 | 1 | -0/+6 |
* | | | | | | | | | | | | | | | Merge "NuPlayerDriver: acquire mLock when needed." into mnc-dr-dev | Wei Jia | 2015-10-13 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | NuPlayerDriver: acquire mLock when needed. | Wei Jia | 2015-10-13 | 1 | -1/+1 |
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Merge "NuPlayerRenderer: always update MediaClock with max media duration." i... | Wei Jia | 2015-10-13 | 1 | -9/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | NuPlayerRenderer: always update MediaClock with max media duration. | Wei Jia | 2015-10-13 | 1 | -9/+7 |
* | | | | | | | | | | | | | | | Merge "libstagefright: don't reclaim codec when there's buffer owned by clien... | Ronghua Wu | 2015-10-13 | 2 | -2/+45 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | libstagefright: don't reclaim codec when there's buffer owned | Ronghua Wu | 2015-10-05 | 2 | -2/+45 |
* | | | | | | | | | | | | | | | am 136ea31a: am 602343bb: am 480f0ca9: am 9d1bc9f2: resolved conflicts for 4b... | Andy Hung | 2015-10-13 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | am 602343bb: am 480f0ca9: am 9d1bc9f2: resolved conflicts for 4beea277 to lmp... | Andy Hung | 2015-10-13 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | am 480f0ca9: am 9d1bc9f2: resolved conflicts for 4beea277 to lmp-mr1-dev | Andy Hung | 2015-10-13 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / | | | |/| | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | am 9d1bc9f2: resolved conflicts for 4beea277 to lmp-mr1-dev | Andy Hung | 2015-10-13 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / / / / / | | | | |/| | | | | | | | | | | |||||
| | | | * | | | | | | | | | | | resolved conflicts for 4beea277 to lmp-mr1-dev | Andy Hung | 2015-10-13 | 0 | -0/+0 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|/ / / / / / / | | | | | |/| | | | | | | | | |