summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix missing mutex lock in Drm::binderDiedJeff Tinker2014-11-161-1/+5
* Merge "HTTPLiveSource: NULL check in getFormat" into lmp-mr1-devRobert Shih2014-11-101-0/+4
|\
| * HTTPLiveSource: NULL check in getFormatRobert Shih2014-11-081-0/+4
* | am 2dca6f68: am 995599cb: audioflinger: fix duplicating thread output buffers...Eric Laurent2014-11-100-0/+0
|\ \
| * \ am 995599cb: audioflinger: fix duplicating thread output buffers clearEric Laurent2014-11-101-1/+5
| |\ \
| | * | audioflinger: fix duplicating thread output buffers clearEric Laurent2014-11-101-1/+5
* | | | audioflinger: fix duplicating thread output buffers clearEric Laurent2014-11-071-1/+5
* | | | Merge "Improve AudioTrack recovery from mediaserver death" into lmp-mr1-devGlenn Kasten2014-11-073-20/+35
|\ \ \ \
| * | | | Improve AudioTrack recovery from mediaserver deathGlenn Kasten2014-11-053-20/+35
| | |_|/ | |/| |
* | | | Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-devDan Stoza2014-11-0721-22/+22
|\ \ \ \
| * | | | Add a BufferItem parameter to onFrameAvailableDan Stoza2014-11-0421-22/+22
* | | | | Merge "AudioSystem: remove obsolete method." into lmp-mr1-devEric Laurent2014-11-072-17/+0
|\ \ \ \ \
| * | | | | AudioSystem: remove obsolete method.Eric Laurent2014-11-062-17/+0
* | | | | | Merge "Fix memory leak" into lmp-mr1-devGlenn Kasten2014-11-071-3/+3
|\ \ \ \ \ \
| * | | | | | Fix memory leakGlenn Kasten2014-11-061-3/+3
* | | | | | | Fix build, update mock drm pluginJeff Tinker2014-11-062-0/+27
* | | | | | | Merge "AnotherPacketSource.cpp: Do not queue discontinity signal buffer resul...Wei Jia2014-11-069-57/+55
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | AnotherPacketSource.cpp: Do not queue discontinity signal buffer resulted fro...Wei Jia2014-11-069-57/+55
| | |/ / / / | |/| | | |
* | | | | | Merge "Pass resolution to Crypto plugin on format change" into lmp-mr1-devJeff Tinker2014-11-065-2/+43
|\ \ \ \ \ \
| * | | | | | Pass resolution to Crypto plugin on format changeJeff Tinker2014-11-035-2/+43
* | | | | | | Merge "Add missing secure stop methods" into lmp-mr1-devJeff Tinker2014-11-065-3/+83
|\ \ \ \ \ \ \ | |/ / / / / / | | | / / / / | |_|/ / / / |/| | | | |
| * | | | | Add missing secure stop methodsJeff Tinker2014-10-315-3/+83
* | | | | | IAudioPolicyService: bound array size in queryDefaultPreProcessingEric Laurent2014-11-052-5/+13
| |_|/ / / |/| | | |
* | | | | Merge "remove some restrictions on effect output channels" into lmp-mr1-devEric Laurent2014-11-041-1/+2
|\ \ \ \ \
| * | | | | remove some restrictions on effect output channelsEric Laurent2014-11-031-1/+2
* | | | | | Merge "audio: fix talkback why alarm is playing" into lmp-mr1-devEric Laurent2014-11-041-4/+11
|\ \ \ \ \ \
| * | | | | | audio: fix talkback why alarm is playingEric Laurent2014-11-031-4/+11
| |/ / / / /
* | | | | | am 9c0c41ff: am 42f785c5: am 4fbe49a8: am 96016c2d: am 9944ff09: am 70c3507d:...Eric Laurent2014-11-040-0/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | am 9c0c41ff: am 42f785c5: am 4fbe49a8: am 96016c2d: am 9944ff09: am 70c3507d:...Eric Laurent2014-11-030-0/+0
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | am 42f785c5: am 4fbe49a8: am 96016c2d: am 9944ff09: am 70c3507d: am 450b10c9:...Eric Laurent2014-11-030-0/+0
| | |\ \ \ \
| | | * \ \ \ am 42f785c5: am 4fbe49a8: am 96016c2d: am 9944ff09: am 70c3507d: am 450b10c9:...Eric Laurent2014-10-311-1/+19
| | | |\ \ \ \
* | | | \ \ \ \ am 9c356efa: Revert "audio: prevent larger than required sleeps - DO NOT MERG...Chris Elliott2014-11-040-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 9c356efa: Revert "audio: prevent larger than required sleeps - DO NOT MERG...Chris Elliott2014-11-030-0/+0
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Revert "audio: prevent larger than required sleeps - DO NOT MERGE" automerge:...Chris Elliott2014-11-030-0/+0
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Revert "audio: prevent larger than required sleeps - DO NOT MERGE"Chris Elliott2014-10-280-0/+0
| | | |\ \ \ \ \
* | | | \ \ \ \ \ am 4b189fe2: audio: prevent larger than required sleeps - DO NOT MERGE autome...Chris Elliott2014-11-040-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 4b189fe2: audio: prevent larger than required sleeps - DO NOT MERGE autome...Chris Elliott2014-11-030-0/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | audio: prevent larger than required sleeps - DO NOT MERGE automerge: 620208d ...Chris Elliott2014-11-030-0/+0
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | audio: prevent larger than required sleeps - DO NOT MERGEChris Elliott2014-10-280-0/+0
| | | |\ \ \ \ \ \
* | | | \ \ \ \ \ \ am 1aed5c92: Revert "audio: prevent larger than required sleeps - DO NOT MERG...Chris Elliott2014-11-040-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am 1aed5c92: Revert "audio: prevent larger than required sleeps - DO NOT MERG...Chris Elliott2014-11-030-0/+0
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Revert "audio: prevent larger than required sleeps - DO NOT MERGE" automerge:...Chris Elliott2014-11-030-0/+0
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | Revert "audio: prevent larger than required sleeps - DO NOT MERGE"Chris Elliott2014-10-280-0/+0
| | | |\ \ \ \ \ \ \
* | | | \ \ \ \ \ \ \ am d6d711c3: audio: prevent larger than required sleeps - DO NOT MERGE autome...Haynes Mathew George2014-11-040-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am d6d711c3: audio: prevent larger than required sleeps - DO NOT MERGE autome...Haynes Mathew George2014-11-030-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | audio: prevent larger than required sleeps - DO NOT MERGE automerge: 8c0417c ...Haynes Mathew George2014-11-030-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | audio: prevent larger than required sleeps - DO NOT MERGEHaynes Mathew George2014-10-280-0/+0
| | | |\ \ \ \ \ \ \ \
* | | | \ \ \ \ \ \ \ \ Merge "CameraService: API1: fix picture FOV" into lmp-mr1-devChien-Yu Chen2014-11-031-0/+14
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | CameraService: API1: fix picture FOVChien-Yu Chen2014-10-281-0/+14
* | | | | | | | | | | | | camera: fix vendortags section malloc failureGaurav Batra2014-11-031-1/+1
| |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |