summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* NuPlayerDriver: acquire mLock when needed.Wei Jia2015-10-131-1/+1
* Merge "libstagefright: don't reclaim codec when there's buffer owned by clien...Ronghua Wu2015-10-132-2/+45
|\
| * libstagefright: don't reclaim codec when there's buffer ownedRonghua Wu2015-10-052-2/+45
* | am 136ea31a: am 602343bb: am 480f0ca9: am 9d1bc9f2: resolved conflicts for 4b...Andy Hung2015-10-130-0/+0
|\ \
| * \ am 602343bb: am 480f0ca9: am 9d1bc9f2: resolved conflicts for 4beea277 to lmp...Andy Hung2015-10-130-0/+0
| |\ \
| | * \ am 480f0ca9: am 9d1bc9f2: resolved conflicts for 4beea277 to lmp-mr1-devAndy Hung2015-10-130-0/+0
| | |\ \
| | | * \ am 9d1bc9f2: resolved conflicts for 4beea277 to lmp-mr1-devAndy Hung2015-10-130-0/+0
| | | |\ \
| | | | * \ resolved conflicts for 4beea277 to lmp-mr1-devAndy Hung2015-10-130-0/+0
| | | | |\ \
| | | | | * \ am e5326d96: Merge "DO NOT MERGE - audio policy: fix commit dea1541f" into lm...Andy Hung2015-10-132-18/+18
| | | | | |\ \
| | | | | | * \ Merge "DO NOT MERGE - audio policy: fix commit dea1541f" into lmp-devAndy Hung2015-10-132-18/+18
| | | | | | |\ \
| | | | | | | * | DO NOT MERGE - audio policy: fix commit dea1541fEric Laurent2015-09-162-18/+18
* | | | | | | | | am 4c6e77ff: AudioFlinger: Clear record buffers when starting RecordThreadAndy Hung2015-10-132-2/+7
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | AudioFlinger: Clear record buffers when starting RecordThreadAndy Hung2015-10-132-2/+7
* | | | | | | | | am 5076a51e: am ae827fb4: (-s ours) am 1231bdbe: am 6f235327: am d4ee847f: am...Andy Hung2015-10-130-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am ae827fb4: (-s ours) am 1231bdbe: am 6f235327: am d4ee847f: am d1c9037a: Me...Andy Hung2015-10-130-0/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | am 1231bdbe: am 6f235327: am d4ee847f: am d1c9037a: Merge "DO NOT MERGE - aud...Andy Hung2015-10-130-0/+0
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | am 6f235327: am d4ee847f: am d1c9037a: Merge "DO NOT MERGE - audio policy: va...Andy Hung2015-10-130-0/+0
| | | |\ \ \ \ \ \ | | | | |/ / / / /
| | | | * | | | | am d4ee847f: am d1c9037a: Merge "DO NOT MERGE - audio policy: validate stream...Andy Hung2015-10-130-0/+0
| | | | |\ \ \ \ \ | | | | | |/ / / /
| | | | | * | | | am d1c9037a: Merge "DO NOT MERGE - audio policy: validate stream type receive...Andy Hung2015-10-130-0/+0
| | | | | |\ \ \ \ | | | | | | |/ / /
| | | | | | * | | Merge "DO NOT MERGE - audio policy: validate stream type received from binder...Andy Hung2015-10-132-0/+42
| | | | | | |\ \ \ | | | | | | | |/ /
| | | | | | | * | DO NOT MERGE - audio policy: validate stream type received from binder calls.Eric Laurent2015-09-162-0/+42
* | | | | | | | | am a0f49d69: am 867f877f: (-s ours) am 7ea1ed87: am 1b6bb62c: am 07d70319: am...Wei Jia2015-10-080-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 867f877f: (-s ours) am 7ea1ed87: am 1b6bb62c: am 07d70319: am 0b1936be: am...Wei Jia2015-10-080-0/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | am 7ea1ed87: am 1b6bb62c: am 07d70319: am 0b1936be: am dd184a48: (-s ours) am...Wei Jia2015-10-080-0/+0
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | am 1b6bb62c: am 07d70319: am 0b1936be: am dd184a48: (-s ours) am 3b4a72ac: Me...Wei Jia2015-10-080-0/+0
| | | |\ \ \ \ \ \ | | | | |/ / / / /
| | | | * | | | | am 07d70319: am 0b1936be: am dd184a48: (-s ours) am 3b4a72ac: Merge "DO NOT M...Wei Jia2015-10-080-0/+0
| | | | |\ \ \ \ \ | | | | | |/ / / /
| | | | | * | | | am 0b1936be: am dd184a48: (-s ours) am 3b4a72ac: Merge "DO NOT MERGE - OMX: a...Wei Jia2015-10-080-0/+0
| | | | | |\ \ \ \ | | | | | | |/ / /
| | | | | | * | | am dd184a48: (-s ours) am 3b4a72ac: Merge "DO NOT MERGE - OMX: allow only sec...Wei Jia2015-10-080-0/+0
| | | | | | |\ \ \
| | | | | | | * \ \ am 3b4a72ac: Merge "DO NOT MERGE - OMX: allow only secure codec to remotely c...Wei Jia2015-10-086-3/+28
| | | | | | | |\ \ \
| | | | | | | | * \ \ Merge "DO NOT MERGE - OMX: allow only secure codec to remotely call allocateB...Wei Jia2015-10-086-3/+28
| | | | | | | | |\ \ \
| | | | | | | | | * | | DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer.Wei Jia2015-10-076-3/+28
* | | | | | | | | | | | am d77dc131: am 91aa4a0a: (-s ours) am f106f9e4: am 15e991bd: resolved confli...Wei Jia2015-10-080-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | am 91aa4a0a: (-s ours) am f106f9e4: am 15e991bd: resolved conflicts for 0b09d...Wei Jia2015-10-080-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | am f106f9e4: am 15e991bd: resolved conflicts for 0b09da7a to lmp-mr1-devWei Jia2015-10-086-0/+25
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | am 15e991bd: resolved conflicts for 0b09da7a to lmp-mr1-devWei Jia2015-10-086-0/+25
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / /
| | | | * | | | | | | | resolved conflicts for 0b09da7a to lmp-mr1-devWei Jia2015-10-086-0/+25
| | | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / /
| | | | | * | | | | | | am 04c02eeb: Merge "DO NOT MERGE - OMX: allow only secure codec to remotely c...Wei Jia2015-10-086-3/+28
| | | | | |\ \ \ \ \ \ \ | | | | | | |/ / / / / /
| | | | | | * | | | | | Merge "DO NOT MERGE - OMX: allow only secure codec to remotely call allocateB...Wei Jia2015-10-086-3/+28
| | | | | | |\ \ \ \ \ \
| | | | | | | * | | | | | DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer.Wei Jia2015-10-076-3/+28
* | | | | | | | | | | | | Merge "AudioTrack: Prevent stop() from reissuing last marker event" into mnc-...Glenn Kasten2015-10-071-3/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | AudioTrack: Prevent stop() from reissuing last marker eventAndy Hung2015-10-061-3/+12
* | | | | | | | | | | | | | am 5dcef419: am a6b9d752: am d4df7559: am 39f64a1e: am 8b713f11: am b75a78db:...Wei Jia2015-10-060-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | am a6b9d752: am d4df7559: am 39f64a1e: am 8b713f11: am b75a78db: am fc0e2a87:...Wei Jia2015-10-060-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | am d4df7559: am 39f64a1e: am 8b713f11: am b75a78db: am fc0e2a87: am 7ed8d1ef:...Wei Jia2015-10-061-2/+19
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | am 39f64a1e: am 8b713f11: am b75a78db: am fc0e2a87: am 7ed8d1ef: ID3: check p...Wei Jia2015-10-061-2/+19
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / | | | | |/| | | | | | | | |
| | | | * | | | | | | | | | am 8b713f11: am b75a78db: am fc0e2a87: am 7ed8d1ef: ID3: check possible integ...Wei Jia2015-10-061-2/+19
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / | | | | | |/| | | | | | | |
| | | | | * | | | | | | | | am b75a78db: am fc0e2a87: am 7ed8d1ef: ID3: check possible integer overflow f...Wei Jia2015-10-061-2/+19
| | | | | |\ \ \ \ \ \ \ \ \ | | | | | | | |/ / / / / / / | | | | | | |/| | | | | | |
| | | | | | * | | | | | | | am fc0e2a87: am 7ed8d1ef: ID3: check possible integer overflow for extendedHe...Wei Jia2015-10-061-2/+19
| | | | | | |\ \ \ \ \ \ \ \ | | | | | | | |_|/ / / / / / | | | | | | |/| | / / / / / | | | | | | | | |/ / / / / | | | | | | | |/| | | | |
| | | | | | | * | | | | | am 7ed8d1ef: ID3: check possible integer overflow for extendedHeaderSize and ...Wei Jia2015-10-061-2/+19
| | | | | | | |\ \ \ \ \ \ | | | | | | | | | |/ / / / | | | | | | | | |/| | | |
| | | | | | | | * | | | | ID3: check possible integer overflow for extendedHeaderSize and paddingSize.Wei Jia2015-10-061-2/+19
| | | | | | | | | |/ / / | | | | | | | | |/| | |