summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* resolve merge conflicts of 88b736a198 to lmp-dev.Eino-Ville Talvala2016-01-1412-5/+43
|\
| * Camera: Disallow dumping clients directlyEino-Ville Talvala2016-01-1412-5/+43
| |\
| | * Camera: Disallow dumping clients directlyEino-Ville Talvala2016-01-1312-5/+43
* | | Fix out-of-bounds write am: 5403587a74Marco Nelissen2016-01-121-1/+9
|\ \ \ | |/ /
| * | Fix out-of-bounds writeMarco Nelissen2016-01-121-1/+9
| |\ \ | | |/
| | * Fix out-of-bounds writeMarco Nelissen2016-01-121-1/+9
* | | fix possible overflow in effect wrappers. am: 9e29523b95Eric Laurent2016-01-122-2/+8
|\ \ \ | |/ /
| * | fix possible overflow in effect wrappers.Eric Laurent2016-01-122-2/+8
| |\ \ | | |/
| | * fix possible overflow in effect wrappers.Eric Laurent2016-01-112-2/+8
* | | DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread a...Andy Hung2015-12-030-0/+0
|\ \ \ | |/ /
| * | DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThreadAndy Hung2015-12-032-21/+44
| |\ \ | | |/
| | * DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThreadAndy Hung2015-12-032-21/+44
* | | Merge "DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolT...Andy Hung2015-12-032-21/+44
|\ \ \
| * | | DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThreadAndy Hung2015-12-022-21/+44
* | | | DO NOT MERGE - libstagefright: check requested memory size before allocation ...Wei Jia2015-12-030-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | DO NOT MERGE - libstagefright: check requested memory size before allocation ...Wei Jia2015-12-032-1/+18
| |\ \ \ | | | |/ | | |/|
| | * | DO NOT MERGE - libstagefright: check requested memory size before allocation ...Wei Jia2015-12-032-1/+18
* | | | DO NOT MERGE - libstagefright: check requested memory size before allocation ...Wei Jia2015-12-032-0/+18
| |_|/ |/| |
* | | GenericSource: reset mDecryptHandle when mDataSource is cleared.Wei Jia2015-10-221-0/+1
* | | GenericSource: reset mDrmManagerClient when mDataSource is cleared.Wei Jia2015-10-211-0/+1
* | | Merge "stagefright: MPEG4Extractor: allow \'hdlr\' box before first track" in...Jon Larimer2015-10-201-1/+3
|\ \ \ | |/ /
| * | Merge "stagefright: MPEG4Extractor: allow \'hdlr\' box before first track" in...Jon Larimer2015-10-201-1/+3
| |\ \ | | |/
| | * Merge "stagefright: MPEG4Extractor: allow 'hdlr' box before first track" into...Jon Larimer2015-10-201-1/+3
| | |\
| | | * stagefright: MPEG4Extractor: allow 'hdlr' box before first trackLajos Molnar2015-10-021-1/+3
* | | | 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
* | | | | 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
* | | | | | 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 - 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
* | | | | | | | 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 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
* | | | | | | | 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 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
| | |/ / / / /
* | | | | | | am 00f5fa82: am 74d1927e: Merge "Check NAL size before use" into klp-devMarco Nelissen2015-10-061-2/+9
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 74d1927e: Merge "Check NAL size before use" into klp-devMarco Nelissen2015-10-061-2/+9
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Check NAL size before use" into klp-devMarco Nelissen2015-10-061-2/+9
| | |\ \ \ \ \
| | | * | | | | Check NAL size before useMarco Nelissen2015-10-061-2/+9
| | | | |_|_|/ | | | |/| | |
* | | | | | | am 60b25aa0: am 9ab9c85e: Merge "MPEG4Extractor: ensure buffer size is not le...Wei Jia2015-10-061-0/+6
|\ \ \ \ \ \ \ | |/ / / / / /