summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | | | * | | | | | | | Camera: Disallow dumping clients directlyEino-Ville Talvala2016-01-1310-6/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Camera service dumps should only be initiated through ICameraService::dump. Bug: 26265403 Change-Id: If3ca4718ed74bf33ad8a416192689203029e2803
| | * | | | | | | | | | | Camera: set mNumberOfNormalCameras correctlyYin-Chia Yeh2016-01-131-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 6dd6c54651 * commit '6dd6c546513aa18dc1d7fba0f72d670edce34f77': Camera: set mNumberOfNormalCameras correctly
| | | * | | | | | | | | | Camera: set mNumberOfNormalCameras correctlyYin-Chia Yeh2016-01-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Need to set the number correctly when a camera HAL is not present. Bug: 25951590 Change-Id: I666acf7a2a523c51f2c2ae88ff690ca9dccda08c
| | * | | | | | | | | | | Merge "audioflinger: fix standby delay on A2DP output" into mnc-dr1.5-devEric Laurent2016-01-131-3/+20
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | audioflinger: fix standby delay on A2DP outputEric Laurent2016-01-121-3/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure that standby delay is never less than the audio flinger default on A2DP output. Due to variable latency and amount of buffering in A2DP sinks, an agressive standby delay could lead to truncated audio. Bug: 25830539. Change-Id: I38be37ad346f5f4bf8303d3db4e3e911bf637968 (cherry picked from commit 42537be61479e59c4718e1304364551c1454f63c)
| | * | | | | | | | | | | | Fix out-of-bounds write am: 5403587a74 am: fb2eb86102 am: e6bd186c7e am: ↵Marco Nelissen2016-01-121-1/+9
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| / / / / / / / / / / | | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a8ac8f617b am: e2e46f5fa1 am: 2304c606eb am: 0945199000 am: a39f981875 am: e463301aa4 am: 0dd00d9b19 * commit '0dd00d9b1986cd2cc4f45bdb96266dee01f20d72': Fix out-of-bounds write
| | | * | | | | | | | | | Fix out-of-bounds write am: 5403587a74 am: fb2eb86102 am: e6bd186c7e am: ↵Marco Nelissen2016-01-121-1/+9
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a8ac8f617b am: e2e46f5fa1 am: 2304c606eb am: 0945199000 am: a39f981875 am: e463301aa4 * commit 'e463301aa44f0ea0ae1a2399bf8800d94cf6ce3e': Fix out-of-bounds write
| | | | * | | | | | | | | Fix out-of-bounds write am: 5403587a74 am: fb2eb86102 am: e6bd186c7e am: ↵Marco Nelissen2016-01-121-1/+9
| | | | |\ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a8ac8f617b am: e2e46f5fa1 am: 2304c606eb am: 0945199000 am: a39f981875 * commit 'a39f9818759155a2651995d6844f9821d83e3f0d': Fix out-of-bounds write
| | | | | * | | | | | | | Fix out-of-bounds write am: 5403587a74 am: fb2eb86102 am: e6bd186c7e am: ↵Marco Nelissen2016-01-121-1/+9
| | | | | |\ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a8ac8f617b am: e2e46f5fa1 am: 2304c606eb am: 0945199000 * commit '0945199000aaa5a628705de69f17d28a5c04cc36': Fix out-of-bounds write
| | | | | | * | | | | | | Fix out-of-bounds write am: 5403587a74 am: fb2eb86102 am: e6bd186c7e am: ↵Marco Nelissen2016-01-121-1/+9
| | | | | | |\ \ \ \ \ \ \ | | | | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a8ac8f617b am: e2e46f5fa1 am: 2304c606eb * commit '2304c606eb2eb9e6f21fcca0e6dcd4ac8156779a': Fix out-of-bounds write
| | | | | | | * | | | | | Fix out-of-bounds write am: 5403587a74 am: fb2eb86102 am: e6bd186c7e am: ↵Marco Nelissen2016-01-121-1/+9
| | | | | | | |\ \ \ \ \ \ | | | | | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a8ac8f617b am: e2e46f5fa1 * commit 'e2e46f5fa1e669fb7f00b3ed2bbc37390e0a5a68': Fix out-of-bounds write
| | | | | | | | * | | | | Fix out-of-bounds write am: 5403587a74 am: fb2eb86102 am: e6bd186c7eMarco Nelissen2016-01-121-1/+9
| | | | | | | | |\ \ \ \ \ | | | | | | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: a8ac8f617b * commit 'a8ac8f617b2df8f07935d3e1e47189dee2381b88': Fix out-of-bounds write
| | | | | | | | | * | | | Fix out-of-bounds write am: 5403587a74 am: fb2eb86102Marco Nelissen2016-01-121-1/+9
| | | | | | | | | |\ \ \ \ | | | | | | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: e6bd186c7e * commit 'e6bd186c7e2a3b948fdd27a4b71048ee85229e7c': Fix out-of-bounds write
| | | | | | | | | | * | | Fix out-of-bounds write am: 5403587a74Marco Nelissen2016-01-121-1/+9
| | | | | | | | | | |\ \ \ | | | | | | | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: fb2eb86102 * commit 'fb2eb8610208d3ad2ea69f57a151ffe436c6c6e6': Fix out-of-bounds write
| | | | | | | | | | | * | Fix out-of-bounds writeMarco Nelissen2016-01-121-1/+9
| | | | | | | | | | | |\ \ | | | | | | | | | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 5403587a74 * commit '5403587a74aee2fb57076528c3927851531c8afb': Fix out-of-bounds write
| | | | | | | | | | | | * Fix out-of-bounds writeMarco Nelissen2016-01-121-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 26365349 Change-Id: Ia363d9f8c231cf255dea852e0bbf5ca466c7990b
| | * | | | | | | | | | | DO NOT MERGE ANYWHERE Revert "fix possible overflow in effect wrappers." am: ↵Eric Laurent2016-01-120-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9cebd7cfba -s ours am: cf2f811d75 -s ours am: a1cba19136 -s ours am: 62e7493876 -s ours * commit '62e7493876a9b8db0a4e1930ce24d3f1a8f32cb8': DO NOT MERGE ANYWHERE Revert "fix possible overflow in effect wrappers."
| | | * | | | | | | | | | DO NOT MERGE ANYWHERE Revert "fix possible overflow in effect wrappers." am: ↵Eric Laurent2016-01-120-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9cebd7cfba -s ours am: cf2f811d75 -s ours am: a1cba19136 -s ours * commit 'a1cba19136a272e5621f993b70a15f9a1d66aafd': DO NOT MERGE ANYWHERE Revert "fix possible overflow in effect wrappers."
| | | | * | | | | | | | | DO NOT MERGE ANYWHERE Revert "fix possible overflow in effect wrappers." am: ↵Eric Laurent2016-01-120-0/+0
| | | | |\ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9cebd7cfba -s ours am: cf2f811d75 -s ours * commit 'cf2f811d7586cb48d261d44fc3e62b67de8f30ff': DO NOT MERGE ANYWHERE Revert "fix possible overflow in effect wrappers."
| | | | | * | | | | | | | DO NOT MERGE ANYWHERE Revert "fix possible overflow in effect wrappers."Eric Laurent2016-01-120-0/+0
| | | | | |\ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 9cebd7cfba -s ours * commit '9cebd7cfba272117522617661cf9d4985880921e': DO NOT MERGE ANYWHERE Revert "fix possible overflow in effect wrappers."
| | | | | | * | | | | | | DO NOT MERGE ANYWHERE Revert "fix possible overflow in effect wrappers."Eric Laurent2016-01-122-8/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 9e29523b9537983b4c4b205ff868d0b3bca0383b. Change-Id: Ic9a97d1a98165500dd444b97629349cf082ced94
| | * | | | | | | | | | | fix possible overflow in effect wrappers. am: 9e29523b95 am: baebc739b0 am: ↵Eric Laurent2016-01-122-2/+8
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3a9d4f4a83 am: 5b7c20dd1e am: df81fc3f3c am: 68e43cf141 am: b1338d3cfc am: 440c9e9b72 am: 9950df2504 am: de98d9b7c1 * commit 'de98d9b7c19882dd8c3394c7653ed2eeccee713c': fix possible overflow in effect wrappers.
| | | * | | | | | | | | | fix possible overflow in effect wrappers. am: 9e29523b95 am: baebc739b0 am: ↵Eric Laurent2016-01-122-2/+8
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3a9d4f4a83 am: 5b7c20dd1e am: df81fc3f3c am: 68e43cf141 am: b1338d3cfc am: 440c9e9b72 am: 9950df2504 * commit '9950df2504daeb1bde86603065ef072155e48ecf': fix possible overflow in effect wrappers.
| | | | * | | | | | | | | fix possible overflow in effect wrappers. am: 9e29523b95 am: baebc739b0 am: ↵Eric Laurent2016-01-122-2/+8
| | | | |\ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3a9d4f4a83 am: 5b7c20dd1e am: df81fc3f3c am: 68e43cf141 am: b1338d3cfc am: 440c9e9b72 * commit '440c9e9b72277d6fc6cea630b9ab50f12687a9c0': fix possible overflow in effect wrappers.
| | | | | * | | | | | | | fix possible overflow in effect wrappers. am: 9e29523b95 am: baebc739b0 am: ↵Eric Laurent2016-01-122-2/+8
| | | | | |\ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3a9d4f4a83 am: 5b7c20dd1e am: df81fc3f3c am: 68e43cf141 am: b1338d3cfc * commit 'b1338d3cfcb47d0fc5f21e2b939d66316b307fe3': fix possible overflow in effect wrappers.
| | | | | | * | | | | | | fix possible overflow in effect wrappers. am: 9e29523b95 am: baebc739b0 am: ↵Eric Laurent2016-01-122-2/+8
| | | | | | |\ \ \ \ \ \ \ | | | | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3a9d4f4a83 am: 5b7c20dd1e am: df81fc3f3c am: 68e43cf141 * commit '68e43cf141a5851c242bce776dff93f7136cbea6': fix possible overflow in effect wrappers.
| | | | | | | * | | | | | fix possible overflow in effect wrappers. am: 9e29523b95 am: baebc739b0 am: ↵Eric Laurent2016-01-122-2/+8
| | | | | | | |\ \ \ \ \ \ | | | | | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3a9d4f4a83 am: 5b7c20dd1e am: df81fc3f3c * commit 'df81fc3f3c56048a797232fa49185831f250e57c': fix possible overflow in effect wrappers.
| | | | | | | | * | | | | fix possible overflow in effect wrappers. am: 9e29523b95 am: baebc739b0 am: ↵Eric Laurent2016-01-122-2/+8
| | | | | | | | |\ \ \ \ \ | | | | | | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3a9d4f4a83 am: 5b7c20dd1e * commit '5b7c20dd1ee9eff7f96676cec68d4b74e33440e7': fix possible overflow in effect wrappers.
| | | | | | | | | * | | | fix possible overflow in effect wrappers. am: 9e29523b95 am: baebc739b0Eric Laurent2016-01-122-2/+8
| | | | | | | | | |\ \ \ \ | | | | | | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 3a9d4f4a83 * commit '3a9d4f4a83341e4c083aa50a651fe5d765ef70ad': fix possible overflow in effect wrappers.
| | | | | | | | | | * | | fix possible overflow in effect wrappers. am: 9e29523b95Eric Laurent2016-01-122-2/+8
| | | | | | | | | | |\ \ \ | | | | | | | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: baebc739b0 * commit 'baebc739b0fe7257b26bfe105b67409559171c82': fix possible overflow in effect wrappers.
| | | | | | | | | | | * | fix possible overflow in effect wrappers.Eric Laurent2016-01-122-2/+8
| | | | | | | | | | | |\ \ | | | | | | | | | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 9e29523b95 * commit '9e29523b9537983b4c4b205ff868d0b3bca0383b': fix possible overflow in effect wrappers.
| | | | | | | | | | | | * fix possible overflow in effect wrappers.Eric Laurent2016-01-112-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add checks on parameter size field in effect command handlers to avoid overflow leading to invalid comparison with min allowed size for command and reply buffers. Bug: 26347509. Change-Id: I20e6a9b6de8e5172b957caa1ac9410b9752efa4d (cherry picked from commit ad1bd92a49d78df6bc6e75bee68c517c1326f3cf)
| | * | | | | | | | | | | DO NOT MERGE - libstagefright: check requested memory size before allocation ↵Wei Jia2015-12-100-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for SoftMPEG4Encoder and SoftVPXEncoder. am: 50270d98e2 am: 1856f1fe34 am: 2c59cc083d -s ours am: c653d2f19e am: 62646f8c4b am: 2b8d26ba65 * commit '2b8d26ba65596027d33e3855e1fb203214dfca2d': DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.
| | | * | | | | | | | | | DO NOT MERGE - libstagefright: check requested memory size before allocation ↵Wei Jia2015-12-100-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for SoftMPEG4Encoder and SoftVPXEncoder. am: 50270d98e2 am: 1856f1fe34 am: 2c59cc083d -s ours am: c653d2f19e am: 62646f8c4b * commit '62646f8c4bbadf72320ceb0e363f010fbd7d2e6e': DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.
| | | | * | | | | | | | | DO NOT MERGE - libstagefright: check requested memory size before allocation ↵Wei Jia2015-12-100-0/+0
| | | | |\ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for SoftMPEG4Encoder and SoftVPXEncoder. am: 50270d98e2 am: 1856f1fe34 am: 2c59cc083d -s ours am: c653d2f19e * commit 'c653d2f19ee368e75bd7da6327196f971969078d': DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.
| | | | | * | | | | | | | DO NOT MERGE - libstagefright: check requested memory size before allocation ↵Wei Jia2015-12-100-0/+0
| | | | | |\ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for SoftMPEG4Encoder and SoftVPXEncoder. am: 50270d98e2 am: 1856f1fe34 am: 2c59cc083d -s ours * commit '2c59cc083d471fe55abc61870d05952bd242b738': DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.
| | | | | | * | | | | | | DO NOT MERGE - libstagefright: check requested memory size before allocation ↵Wei Jia2015-12-102-0/+18
| | | | | | |\ \ \ \ \ \ \ | | | | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for SoftMPEG4Encoder and SoftVPXEncoder. am: 50270d98e2 am: 1856f1fe34 * commit '1856f1fe348e25c7080c9c8cbd75da21409c179c': DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.
| | | | | | | * | | | | | DO NOT MERGE - libstagefright: check requested memory size before allocation ↵Wei Jia2015-12-102-0/+18
| | | | | | | |\ \ \ \ \ \ | | | | | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for SoftMPEG4Encoder and SoftVPXEncoder. am: 50270d98e2 * commit '50270d98e26fa18b20ca88216c3526667b724ba7': DO NOT MERGE - libstagefright: check requested memory size before allocation for SoftMPEG4Encoder and SoftVPXEncoder.
| | | | | | | | * | | | | DO NOT MERGE - libstagefright: check requested memory size before allocation ↵Wei Jia2015-12-102-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for SoftMPEG4Encoder and SoftVPXEncoder. Bug: 25812794 Change-Id: I96dc74734380d462583f6efa33d09946f9532809 (cherry picked from commit 87f8cbb223ee516803dbb99699320c2484cbf3ba) (cherry picked from commit 0462975291796e414891e04bcec9da993914e458)
| | * | | | | | | | | | | Merge "Fix security vulnerability in ICrypto DO NOT MERGE" into mnc-dev am: ↵Jeff Tinker2015-12-091-1/+3
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 89bec04cf8 am: f797a48b4c am: 3f05f30117 * commit '3f05f30117c9ad8a0956f31431ddd5fbc07fbd99': Fix security vulnerability in ICrypto DO NOT MERGE
| | | * | | | | | | | | | Merge "Fix security vulnerability in ICrypto DO NOT MERGE" into mnc-dev am: ↵Jeff Tinker2015-12-101-1/+3
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 89bec04cf8 am: f797a48b4c * commit 'f797a48b4ceaef56402ecd942ccdebab394daad0': Fix security vulnerability in ICrypto DO NOT MERGE
| | | | * | | | | | | | | Merge "Fix security vulnerability in ICrypto DO NOT MERGE" into mnc-devJeff Tinker2015-12-091-1/+3
| | | | |\ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 89bec04cf8 * commit '89bec04cf83598b1868f3f969c220c3200028e03': Fix security vulnerability in ICrypto DO NOT MERGE
| | | | | * | | | | | | | Merge "Fix security vulnerability in ICrypto DO NOT MERGE" into mnc-devJeff Tinker2015-12-101-1/+3
| | | | | |\ \ \ \ \ \ \ \
| | | | | | * | | | | | | | Fix security vulnerability in ICrypto DO NOT MERGEJeff Tinker2015-12-051-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b/25800375 Change-Id: I03c9395f7c7de4ac5813a1207452aac57aa39484
| | * | | | | | | | | | | | DO NOT MERGE nuplayer: do not use cached source for wvm content am: ↵Chong Zhang2015-12-080-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 91a23ed95c am: 83487187ab am: fe2d80d385 -s ours am: e6185af491 am: 3cb2e6732f am: 0e7c8849a9 * commit '0e7c8849a934b0785adde3fd2ca26cc5d54517ee': DO NOT MERGE nuplayer: do not use cached source for wvm content
| | | * | | | | | | | | | | DO NOT MERGE nuplayer: do not use cached source for wvm content am: ↵Chong Zhang2015-12-080-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 91a23ed95c am: 83487187ab am: fe2d80d385 -s ours am: e6185af491 am: 3cb2e6732f * commit '3cb2e6732f6d7113435443b10fbe9e3ca8e792bb': DO NOT MERGE nuplayer: do not use cached source for wvm content
| | | | * | | | | | | | | | DO NOT MERGE nuplayer: do not use cached source for wvm content am: ↵Chong Zhang2015-12-080-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 91a23ed95c am: 83487187ab am: fe2d80d385 -s ours am: e6185af491 * commit 'e6185af491ba38cd6f2b67874bebe3e6bbf65777': DO NOT MERGE nuplayer: do not use cached source for wvm content
| | | | | * | | | | | | | | DO NOT MERGE nuplayer: do not use cached source for wvm content am: ↵Chong Zhang2015-12-080-0/+0
| | | | | |\ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / | | | | | |/| / / / / / / / | | | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 91a23ed95c am: 83487187ab am: fe2d80d385 -s ours * commit 'fe2d80d385d71be73ba6ac0f5c98de1b524bf12f': DO NOT MERGE nuplayer: do not use cached source for wvm content
| | | | | | * | | | | | | DO NOT MERGE nuplayer: do not use cached source for wvm content am: 91a23ed95cChong Zhang2015-12-081-23/+32
| | | | | | |\ \ \ \ \ \ \ | | | | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 83487187ab * commit '83487187ab549d0966791a60a92d49d77e47f071': DO NOT MERGE nuplayer: do not use cached source for wvm content
| | | | | | | * | | | | | DO NOT MERGE nuplayer: do not use cached source for wvm contentChong Zhang2015-12-081-23/+32
| | | | | | | |\ \ \ \ \ \ | | | | | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 91a23ed95c * commit '91a23ed95cda558a3c31e8ef34f420924f4d6d7d': DO NOT MERGE nuplayer: do not use cached source for wvm content