summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am f8d051fe: am 034d6747: am 1609e451: Merge "Add a BufferItem parameter to o...Dan Stoza2014-11-073-3/+3
|\
| * am 034d6747: am 1609e451: Merge "Add a BufferItem parameter to onFrameAvailab...Dan Stoza2014-11-073-3/+3
| |\
| | * Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-devDan Stoza2014-11-073-3/+3
| | |\
| | | * Add a BufferItem parameter to onFrameAvailableDan Stoza2014-11-043-3/+3
* | | | am caf27abc: am 7e88fac0: Merge "AudioSystem: remove obsolete method." into l...Eric Laurent2014-11-071-15/+0
|\ \ \ \ | |/ / /
| * | | am 7e88fac0: Merge "AudioSystem: remove obsolete method." into lmp-mr1-dev au...Eric Laurent2014-11-071-15/+0
| |\ \ \ | | |/ /
| | * | Merge "AudioSystem: remove obsolete method." into lmp-mr1-devEric Laurent2014-11-071-15/+0
| | |\ \
| | | * | AudioSystem: remove obsolete method.Eric Laurent2014-11-061-15/+0
* | | | | am 989af5d7: am 113adbbc: resolved conflicts for merge of bcf093bf to stage-a...Narayan Kamath2014-11-071-1/+13
|\ \ \ \ \ | |/ / / /
| * | | | am 113adbbc: resolved conflicts for merge of bcf093bf to stage-aosp-masterNarayan Kamath2014-11-071-1/+13
| |\ \ \ \
| | * \ \ \ resolved conflicts for merge of bcf093bf to stage-aosp-masterNarayan Kamath2014-11-071-1/+13
| | |\ \ \ \
| | | * | | | Fix definining of ANDROID_SMP.Ian Rogers2014-11-061-1/+14
| * | | | | | am d11895bc: am 62fe78b6: Merge "Fix memory leak" into lmp-mr1-devGlenn Kasten2014-11-071-3/+3
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Merge "Fix memory leak" into lmp-mr1-devGlenn Kasten2014-11-071-3/+3
| | |\ \ \ \ \
| | | * | | | | Fix memory leakGlenn Kasten2014-11-061-3/+3
* | | | | | | | am 6200e7f4: am 5cccfce1: Merge "AnotherPacketSource.cpp: Do not queue discon...Wei Jia2014-11-079-57/+55
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 5cccfce1: Merge "AnotherPacketSource.cpp: Do not queue discontinity signal...Wei Jia2014-11-079-57/+55
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | 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
| | | | |_|_|/ | | | |/| | |
* | | | | | | am 6e0da022: am e0e8223c: am 1cf9ad1a: Merge "Pass resolution to Crypto plugi...Jeff Tinker2014-11-064-1/+41
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am e0e8223c: am 1cf9ad1a: Merge "Pass resolution to Crypto plugin on format c...Jeff Tinker2014-11-064-1/+41
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Pass resolution to Crypto plugin on format change" into lmp-mr1-devJeff Tinker2014-11-064-1/+41
| | |\ \ \ \ \
| | | * | | | | Pass resolution to Crypto plugin on format changeJeff Tinker2014-11-034-1/+41
* | | | | | | | am a4dd2e19: am 7ed62fb4: am 19a3f69d: Merge "Add missing secure stop methods...Jeff Tinker2014-11-063-2/+71
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 7ed62fb4: am 19a3f69d: Merge "Add missing secure stop methods" into lmp-mr...Jeff Tinker2014-11-063-2/+71
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "Add missing secure stop methods" into lmp-mr1-devJeff Tinker2014-11-063-2/+71
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | / / / | | | |_|/ / / | | |/| | | |
| | | * | | | Add missing secure stop methodsJeff Tinker2014-10-313-2/+71
* | | | | | | Merge "Fix memory leak"Glenn Kasten2014-11-061-3/+3
|\ \ \ \ \ \ \
| * | | | | | | Fix memory leakGlenn Kasten2014-11-051-3/+3
* | | | | | | | am 5fa013ea: am 7e31774e: am 74adca9a: IAudioPolicyService: bound array size ...Eric Laurent2014-11-051-3/+6
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | am 7e31774e: am 74adca9a: IAudioPolicyService: bound array size in queryDefau...Eric Laurent2014-11-051-3/+6
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | IAudioPolicyService: bound array size in queryDefaultPreProcessingEric Laurent2014-11-051-3/+6
* | | | | | | | am bec72a5c: am 5ae9280b: Merge "audio: fix talkback why alarm is playing" in...Eric Laurent2014-11-041-4/+11
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 5ae9280b: Merge "audio: fix talkback why alarm is playing" into lmp-mr1-de...Eric Laurent2014-11-041-4/+11
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | 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 16ef7c82: am 7957cf09: am d9cfeb44: Support speaker routing for FLAG_BEACONJean-Michel Trivi2014-11-011-2/+10
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 7957cf09: am d9cfeb44: Support speaker routing for FLAG_BEACONJean-Michel Trivi2014-11-011-2/+10
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Support speaker routing for FLAG_BEACONJean-Michel Trivi2014-10-311-2/+10
* | | | | | | | am d3a24af8: am b0163c6d: AudioTrack::flush() will no longer flush later data...Glenn Kasten2014-10-311-5/+22
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am b0163c6d: AudioTrack::flush() will no longer flush later data automerge: 2...Glenn Kasten2014-10-311-5/+22
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | AudioTrack::flush() will no longer flush later dataGlenn Kasten2014-10-301-5/+22
| | |/ / / / /
* | | | | | | am f6a22ab1: am b2147445: am 7011ee31: Merge "NuPlayer: reduce offload pause ...Eric Laurent2014-10-312-2/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am b2147445: am 7011ee31: Merge "NuPlayer: reduce offload pause teardown time...Eric Laurent2014-10-312-2/+2
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "NuPlayer: reduce offload pause teardown timeout." into lmp-mr1-devEric Laurent2014-10-292-2/+2
| | |\ \ \ \ \
| | | * | | | | NuPlayer: reduce offload pause teardown timeout.Eric Laurent2014-10-292-2/+2
* | | | | | | | am 0307c3ce: am 97d84d7f: am cde2b722: Merge "NuPlayer: merge start() and res...Wei Jia2014-10-313-105/+103
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 97d84d7f: am cde2b722: Merge "NuPlayer: merge start() and resume()." into ...Wei Jia2014-10-313-105/+103
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "NuPlayer: merge start() and resume()." into lmp-mr1-devWei Jia2014-10-293-105/+103
| | |\ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | | * | | | | NuPlayer: merge start() and resume().Wei Jia2014-10-283-105/+103
| | | |/ / / /