OSDN Git Service

android-x86/frameworks-av.git
7 years agoMerge "CameraBase: Don't return an sp<> by reference" into klp-dev am: fdf64bab96...
Eino-Ville Talvala [Thu, 2 Feb 2017 23:52:04 +0000 (23:52 +0000)]
Merge "CameraBase: Don't return an sp<> by reference" into klp-dev am: fdf64bab96 am: 4fca12e56f
am: f0009384d8

Change-Id: I8efab658bd67af7eb85ac8cd6dc7d6d9fa61ef21

7 years agoCameraBase: Don't return an sp<> by reference am: 4b49489c12 am: 8c32699ceb
Eino-Ville Talvala [Thu, 2 Feb 2017 23:52:01 +0000 (23:52 +0000)]
CameraBase: Don't return an sp<> by reference am: 4b49489c12 am: 8c32699ceb
am: 8806c2a11d

Change-Id: I61be9ab0dbd9acde84811cd437304267b9544099

7 years agoMerge "CameraBase: Don't return an sp<> by reference" into klp-dev am: fdf64bab96
Eino-Ville Talvala [Thu, 2 Feb 2017 23:49:04 +0000 (23:49 +0000)]
Merge "CameraBase: Don't return an sp<> by reference" into klp-dev am: fdf64bab96
am: 4fca12e56f

Change-Id: I082c1ec76a3b05de211d169ee07a7a1f544081dc

7 years agoCameraBase: Don't return an sp<> by reference am: 4b49489c12
Eino-Ville Talvala [Thu, 2 Feb 2017 23:49:01 +0000 (23:49 +0000)]
CameraBase: Don't return an sp<> by reference am: 4b49489c12
am: 8c32699ceb

Change-Id: I6fac31b3eaa435a665643343c2a6d8a6959be107

7 years agoMerge "CameraBase: Don't return an sp<> by reference" into klp-dev
Eino-Ville Talvala [Thu, 2 Feb 2017 23:47:02 +0000 (23:47 +0000)]
Merge "CameraBase: Don't return an sp<> by reference" into klp-dev
am: fdf64bab96

Change-Id: Ied7016c8cfaaa0d7ed714f753b8827cf0179cb1a

7 years agoCameraBase: Don't return an sp<> by reference
Eino-Ville Talvala [Thu, 2 Feb 2017 23:47:01 +0000 (23:47 +0000)]
CameraBase: Don't return an sp<> by reference
am: 4b49489c12

Change-Id: I4befb08a206d22e71a6ab2bfd44fb90ddbd62915

7 years agoMerge "CameraBase: Don't return an sp<> by reference" into klp-dev
Eino-Ville Talvala [Thu, 2 Feb 2017 23:42:07 +0000 (23:42 +0000)]
Merge "CameraBase: Don't return an sp<> by reference" into klp-dev

7 years agoRevert "Turn off overflow protection for various math functions" am: 2dd1d5e02e am...
Marco Nelissen [Thu, 2 Feb 2017 21:28:50 +0000 (21:28 +0000)]
Revert "Turn off overflow protection for various math functions" am: 2dd1d5e02e am: aa5498018f
am: ce9cab33b7

Change-Id: Id9318840db48994196c72eb5f14e132e23776bda

7 years agoRevert "Turn off overflow protection for various math functions" am: 2dd1d5e02e
Marco Nelissen [Thu, 2 Feb 2017 21:26:19 +0000 (21:26 +0000)]
Revert "Turn off overflow protection for various math functions" am: 2dd1d5e02e
am: aa5498018f

Change-Id: Ica9690b213037f6bd4c13bf14a4d66b77b7def41

7 years agoRevert "Turn off overflow protection for various math functions"
Marco Nelissen [Thu, 2 Feb 2017 21:24:19 +0000 (21:24 +0000)]
Revert "Turn off overflow protection for various math functions"
am: 2dd1d5e02e

Change-Id: I37734de98f269e6886be0578b4ff9db31229c8de

7 years agoRevert "Turn off overflow protection for various math functions"
Marco Nelissen [Thu, 2 Feb 2017 20:53:17 +0000 (20:53 +0000)]
Revert "Turn off overflow protection for various math functions"

This reverts commit cbf5e6915c42c691a6ccb9a5d249e450f9e67467.

Change-Id: I0a81c26d22fee36485b21c285dcc91fbd518e1dd

7 years agoCameraBase: Don't return an sp<> by reference
Eino-Ville Talvala [Wed, 1 Feb 2017 23:27:41 +0000 (15:27 -0800)]
CameraBase: Don't return an sp<> by reference

If the server dies, the binder death callback clears out
the global camera service sp<>, and any current references to it
will become quite unhappy.

Test: Camera CTS passes
Bug: 31992879
Change-Id: I2966bed35d0319e3f26e3d4b1b8dc08006a22348

7 years agoTurn off overflow protection for various math functions am: cbf5e6915c am: 72b1fdbf49
Marco Nelissen [Thu, 2 Feb 2017 19:36:52 +0000 (19:36 +0000)]
Turn off overflow protection for various math functions am: cbf5e6915c am: 72b1fdbf49
am: a25eb35608

Change-Id: Ia0f2f794297ab8b4c5070e5948c748d0265aa54b

7 years agoTurn off overflow protection for various math functions am: cbf5e6915c
Marco Nelissen [Thu, 2 Feb 2017 19:34:21 +0000 (19:34 +0000)]
Turn off overflow protection for various math functions am: cbf5e6915c
am: 72b1fdbf49

Change-Id: I46daf840866183690f27ff7b3e6ed7ffe8bec9f5

7 years agoTurn off overflow protection for various math functions
Marco Nelissen [Thu, 2 Feb 2017 19:31:52 +0000 (19:31 +0000)]
Turn off overflow protection for various math functions
am: cbf5e6915c

Change-Id: Iee62ce7ef71208e30d9ee7b98342163bfc997779

7 years agoTurn off overflow protection for various math functions
Marco Nelissen [Wed, 1 Feb 2017 23:35:35 +0000 (15:35 -0800)]
Turn off overflow protection for various math functions

These functions also exist as arm assembly files, where the overflows
just wrap around, and this makes their plain C equivalents behave
the same.

Bug: 32577290
Bug: 33071964
Test: ran PoC for bug 32577290 using plain C source code
Change-Id: I73c2609589e7a89d36f6c44391548312259daf14

7 years agoavc_utils: skip empty NALs from malformed bistreams
Robert Shih [Wed, 25 Jan 2017 02:08:59 +0000 (18:08 -0800)]
avc_utils: skip empty NALs from malformed bistreams

Avoid a CHECK and make it the decoder's repsonsibility to handle a
malformed bistream gracefully.

Bug: 34509901
Bug: 33137046
Test: StagefrightTest#testStagefright_bug_27855419_CVE_2016_2463
Change-Id: I2d94f8da63d65a86a9c711c45546e4c695e0f3b4

7 years agoDon't CHECK when buffer is too large am: c2f0c73bfc am: acb7186e6e
Marco Nelissen [Tue, 17 Jan 2017 19:06:56 +0000 (19:06 +0000)]
Don't CHECK when buffer is too large am: c2f0c73bfc am: acb7186e6e
am: 0a4db601b4

Change-Id: I46806d03da614119b805087d995f8f40c70ee3b2

7 years agoDon't CHECK when buffer is too large am: c2f0c73bfc
Marco Nelissen [Tue, 17 Jan 2017 18:46:50 +0000 (18:46 +0000)]
Don't CHECK when buffer is too large am: c2f0c73bfc
am: acb7186e6e

Change-Id: I9af93746702bb746a48420dbb03fc29878ef730f

7 years agoDon't CHECK when buffer is too large
Marco Nelissen [Tue, 17 Jan 2017 18:27:32 +0000 (18:27 +0000)]
Don't CHECK when buffer is too large
am: c2f0c73bfc

Change-Id: Ibcc5b7a28092fdcba5082b956e3bbdb0fc2d3f4a

7 years agoDon't initialize sync sample parameters until the end
Marco Nelissen [Thu, 12 Jan 2017 23:49:04 +0000 (15:49 -0800)]
Don't initialize sync sample parameters until the end

to avoid leaving them in a partially initialized state.

Bug: 33137046
Test: ran CTS tests
Change-Id: I1f5c070233c5917d85da9e930e01a3fc51a0a0ec

7 years agoDon't CHECK when buffer is too large
Marco Nelissen [Fri, 6 Jan 2017 21:57:51 +0000 (13:57 -0800)]
Don't CHECK when buffer is too large

Bug: 31647370
Test: ran CTS test with and without patch
Change-Id: I4e3a37aabc9387432671c1c0c469241142612cc4

7 years agoDO NOT MERGE - improve audio effect framwework thread safety am: b47a5ab107 am: 26cf2...
Eric Laurent [Wed, 4 Jan 2017 22:20:47 +0000 (22:20 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety am: b47a5ab107 am: 26cf2f4d73
am: 73a152960b  -s ours

Change-Id: Id10c17b4bbdc1dd90a1cad25b6c697f8b6a0bcd0

7 years agoDO NOT MERGE - improve audio effect framwework thread safety am: b47a5ab107
Eric Laurent [Wed, 4 Jan 2017 22:17:58 +0000 (22:17 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety am: b47a5ab107
am: 26cf2f4d73

Change-Id: I6513190cce6756c47e5ede0dc578fa0d2c5889b3

7 years agoDO NOT MERGE - improve audio effect framwework thread safety
Eric Laurent [Wed, 4 Jan 2017 22:15:29 +0000 (22:15 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety
am: b47a5ab107

Change-Id: I46af7560653784852e771a2eefd581989aac0644

7 years agoDO NOT MERGE - improve audio effect framwework thread safety
Eric Laurent [Thu, 1 Dec 2016 23:28:29 +0000 (15:28 -0800)]
DO NOT MERGE - improve audio effect framwework thread safety

- Reorganize handle effect creation code to make sure the effect engine
is created with both thread and effect chain mutex held.
- Reorganize handle disconnect code to make sure the effect engine
is released with both thread and effect chain mutex held.
- Protect IEffect interface methods in EffectHande with a Mutex.
- Only pin effect if the session was acquired first.
- Do not use strong pointer to EffectModule in EffectHandles:
only the EffectChain has a single strong reference to the EffectModule.
- Check reply size before writing status in EffectHandle::command()

Bug: 32707507
Bug: 32095713
Change-Id: Ia1098cba2cd32cc2d1c9dfdff4adc2388dfed80e

7 years agoDO NOT MERGE - improve audio effect framwework thread safety
Eric Laurent [Thu, 1 Dec 2016 23:28:29 +0000 (15:28 -0800)]
DO NOT MERGE - improve audio effect framwework thread safety

- Reorganize handle effect creation code to make sure the effect engine
is created with both thread and effect chain mutex held.
- Reorganize handle disconnect code to make sure the effect engine
is released with both thread and effect chain mutex held.
- Protect IEffect interface methods in EffectHande with a Mutex.
- Only pin effect if the session was acquired first.
- Do not use strong pointer to EffectModule in EffectHandles:
only the EffectChain has a single strong reference to the EffectModule.
- Check reply size before writing status in EffectHandle::command()

Bug: 32707507
Bug: 32095713

Change-Id: Ia1098cba2cd32cc2d1c9dfdff4adc2388dfed80e

7 years agoMerge "Effect: Use local cached data for Effect commit" into klp-dev am: 1576f5968c...
Andy Hung [Sat, 3 Dec 2016 00:40:47 +0000 (00:40 +0000)]
Merge "Effect: Use local cached data for Effect commit" into klp-dev am: 1576f5968c am: 308e51173e
am: 94d5167a91

Change-Id: I3a4af7a28adcd54d4590f447845b134acb80f053

7 years agoEffect: Use local cached data for Effect commit am: dd79ccda92 am: 82c8c7656f
Andy Hung [Sat, 3 Dec 2016 00:40:33 +0000 (00:40 +0000)]
Effect: Use local cached data for Effect commit am: dd79ccda92 am: 82c8c7656f
am: 9851dee7da

Change-Id: I3d375c671122e61cf0b530457c37c1cd5c06e563

7 years agoMerge "Effect: Use local cached data for Effect commit" into klp-dev am: 1576f5968c
Andy Hung [Sat, 3 Dec 2016 00:38:50 +0000 (00:38 +0000)]
Merge "Effect: Use local cached data for Effect commit" into klp-dev am: 1576f5968c
am: 308e51173e

Change-Id: I7d741aa81543b95a6c3aeada9a259ba5a4c9b5bb

7 years agoEffect: Use local cached data for Effect commit am: dd79ccda92
Andy Hung [Sat, 3 Dec 2016 00:38:33 +0000 (00:38 +0000)]
Effect: Use local cached data for Effect commit am: dd79ccda92
am: 82c8c7656f

Change-Id: I8819bc1146b0b751abc0790edd4b7d73f2198038

7 years agoMerge "Effect: Use local cached data for Effect commit" into klp-dev
Andy Hung [Sat, 3 Dec 2016 00:36:02 +0000 (00:36 +0000)]
Merge "Effect: Use local cached data for Effect commit" into klp-dev
am: 1576f5968c

Change-Id: I3310e7efeb0bcd1826d112e94e13f46ce5234755

7 years agoEffect: Use local cached data for Effect commit
Andy Hung [Sat, 3 Dec 2016 00:36:01 +0000 (00:36 +0000)]
Effect: Use local cached data for Effect commit
am: dd79ccda92

Change-Id: Ide8165907e03b9d400eaa33a222ceeae782d6509

7 years agoMerge "Effect: Use local cached data for Effect commit" into klp-dev
Andy Hung [Sat, 3 Dec 2016 00:32:27 +0000 (00:32 +0000)]
Merge "Effect: Use local cached data for Effect commit" into klp-dev

7 years agoFix security vulnerability: potential OOB write in audioserver am: e275907e57 am...
rago [Wed, 30 Nov 2016 19:23:21 +0000 (19:23 +0000)]
Fix security vulnerability: potential OOB write in audioserver am: e275907e57 am: 01e854056a
am: 3e8ab60b7f

Change-Id: Ib575df34ec5bb7dc2cd83a859e10abe94e894317

7 years agoFix security vulnerability: potential OOB write in audioserver am: e275907e57
rago [Wed, 30 Nov 2016 19:17:48 +0000 (19:17 +0000)]
Fix security vulnerability: potential OOB write in audioserver am: e275907e57
am: 01e854056a

Change-Id: I7ea6a871eed4b9e1c56c5350c4e5fb5eb628e816

7 years agoFix security vulnerability: potential OOB write in audioserver
rago [Wed, 30 Nov 2016 19:12:17 +0000 (19:12 +0000)]
Fix security vulnerability: potential OOB write in audioserver
am: e275907e57

Change-Id: I38086dbaeeef1c068887cc20aca9d557bb159372

7 years agoFix security vulnerability: potential OOB write in audioserver
rago [Wed, 23 Nov 2016 02:02:48 +0000 (18:02 -0800)]
Fix security vulnerability: potential OOB write in audioserver

Bug: 32705438
Bug: 32703959
Test: cts security test
Change-Id: I8900c92fa55b56c4c2c9d721efdbabe6bfc8a4a4

7 years agoEffect: Use local cached data for Effect commit
Andy Hung [Wed, 16 Nov 2016 01:19:58 +0000 (17:19 -0800)]
Effect: Use local cached data for Effect commit

Test: POC, Cts Effect, BassBoost, EnvReverb, Equalizer,
Test: LoudnessEnhancer, PresetReverb, Virtualizer, Visualizer
Bug: 32220769
Change-Id: Iea96ba0daf71691ee8954cca4ba1c10fe827626e

7 years agoMerge "Fix security vulnerability: Effect command might allow negative indexes" into...
Ricardo Garcia [Tue, 15 Nov 2016 23:43:28 +0000 (23:43 +0000)]
Merge "Fix security vulnerability: Effect command might allow negative indexes" into klp-dev am: 501aee7a54 am: dd269152c4
am: 756f8dcdc1

Change-Id: I9ce75a77ed741953c3476576387eebf77e21f784

7 years agoFix security vulnerability: Effect command might allow negative indexes am: 01183402d...
rago [Tue, 15 Nov 2016 23:43:09 +0000 (23:43 +0000)]
Fix security vulnerability: Effect command might allow negative indexes am: 01183402d7 am: 94e3424b74
am: 9bf3487e7a

Change-Id: Ia36571a591829777096ad41316b7edf169ce9a6c

7 years agoMerge "Fix security vulnerability: Effect command might allow negative indexes" into...
Ricardo Garcia [Tue, 15 Nov 2016 23:35:55 +0000 (23:35 +0000)]
Merge "Fix security vulnerability: Effect command might allow negative indexes" into klp-dev am: 501aee7a54
am: dd269152c4

Change-Id: I336c76f311fc09cd81ccd22a35dada99d0b76be7

7 years agoFix security vulnerability: Effect command might allow negative indexes am: 01183402d7
rago [Tue, 15 Nov 2016 23:35:37 +0000 (23:35 +0000)]
Fix security vulnerability: Effect command might allow negative indexes am: 01183402d7
am: 94e3424b74

Change-Id: Id0353ac5716377b45e3a967110d43d9baf744be8

7 years agoMerge "Fix security vulnerability: Effect command might allow negative indexes" into...
Ricardo Garcia [Tue, 15 Nov 2016 23:28:07 +0000 (23:28 +0000)]
Merge "Fix security vulnerability: Effect command might allow negative indexes" into klp-dev
am: 501aee7a54

Change-Id: I7386c90f91d41d2b6df3efc28cfa6e4b4f79608a

7 years agoFix security vulnerability: Effect command might allow negative indexes
rago [Tue, 15 Nov 2016 23:28:06 +0000 (23:28 +0000)]
Fix security vulnerability: Effect command might allow negative indexes
am: 01183402d7

Change-Id: I13603ac1cdb57b844ca7d03f119adda832825f34

7 years agoMerge "Fix security vulnerability: Effect command might allow negative indexes" into...
Ricardo Garcia [Tue, 15 Nov 2016 23:19:20 +0000 (23:19 +0000)]
Merge "Fix security vulnerability: Effect command might allow negative indexes" into klp-dev

7 years agoFix security vulnerability: Effect command might allow negative indexes
rago [Mon, 14 Nov 2016 22:58:34 +0000 (14:58 -0800)]
Fix security vulnerability: Effect command might allow negative indexes

Bug: 32448258
Bug: 32095626

Test: Use POC bug or cts security test
Change-Id: I69f24eac5866f8d9090fc4c0ebe58c2c297b63df

7 years agoMake VBRISeeker more robust am: 7fdd36418e am: ae0cffaced
Marco Nelissen [Mon, 14 Nov 2016 20:27:34 +0000 (20:27 +0000)]
Make VBRISeeker more robust am: 7fdd36418e am: ae0cffaced
am: 82642824a5

Change-Id: Ia7eb6656c3034793e8caea2b417d99fa0702d05d

7 years agoMake VBRISeeker more robust am: 7fdd36418e
Marco Nelissen [Mon, 14 Nov 2016 20:21:03 +0000 (20:21 +0000)]
Make VBRISeeker more robust am: 7fdd36418e
am: ae0cffaced

Change-Id: I3e6fdf30fc372fb32cfbd24a37814d0946eaca2f

7 years agoMake VBRISeeker more robust
Marco Nelissen [Mon, 14 Nov 2016 20:13:03 +0000 (20:13 +0000)]
Make VBRISeeker more robust
am: 7fdd36418e

Change-Id: I0138de501cd433986e77927e27a527606b61ea25

7 years agoMake VBRISeeker more robust
Marco Nelissen [Fri, 11 Nov 2016 17:20:00 +0000 (09:20 -0800)]
Make VBRISeeker more robust

Bug: 32577290
Change-Id: I9bcc9422ae7dd3ae4a38df330c9dcd7ac4941ec8

7 years agoMerge "Effects: Check get parameter command size" into klp-dev am: c5768d0921 am...
Andy Hung [Thu, 10 Nov 2016 19:33:37 +0000 (19:33 +0000)]
Merge "Effects: Check get parameter command size" into klp-dev am: c5768d0921 am: cfe5d97cf3
am: a74f0af62b

Change-Id: Ib5c23b1eb3919d9f849ec75fe5a46922d08ae12b

7 years agoEffects: Check get parameter command size am: 3d34cc76e3 am: 59920bf785
Andy Hung [Thu, 10 Nov 2016 19:33:22 +0000 (19:33 +0000)]
Effects: Check get parameter command size am: 3d34cc76e3 am: 59920bf785
am: 14d87911d7

Change-Id: Icbc43a1d34af774dcf500cdb3548d0399f0b6943

7 years agoMerge "DO NOT MERGE: Visualizer: Check capture size and latency parameters" into...
Andy Hung [Thu, 10 Nov 2016 19:33:06 +0000 (19:33 +0000)]
Merge "DO NOT MERGE: Visualizer: Check capture size and latency parameters" into klp-dev am: f89590d009 am: 50f9a9faea
am: 684314f196  -s ours

Change-Id: I77de3ae3c9b9032b622b2502b4cda1bf0e0bfaea

7 years agoDO NOT MERGE: Visualizer: Check capture size and latency parameters am: 86cbc180f4...
Andy Hung [Thu, 10 Nov 2016 19:32:51 +0000 (19:32 +0000)]
DO NOT MERGE: Visualizer: Check capture size and latency parameters am: 86cbc180f4 am: ce8b7cd373
am: 34ce18d4e7  -s ours

Change-Id: Icd8dd8dc6674729ab735d09d0b15f18e6fe28bdb

7 years agoMerge "Effects: Check get parameter command size" into klp-dev am: c5768d0921
Andy Hung [Thu, 10 Nov 2016 19:26:36 +0000 (19:26 +0000)]
Merge "Effects: Check get parameter command size" into klp-dev am: c5768d0921
am: cfe5d97cf3

Change-Id: I748c867f0259d70eddec229457ca68ac7581dc09

7 years agoEffects: Check get parameter command size am: 3d34cc76e3
Andy Hung [Thu, 10 Nov 2016 19:26:21 +0000 (19:26 +0000)]
Effects: Check get parameter command size am: 3d34cc76e3
am: 59920bf785

Change-Id: I2d90659faa7d0085b33d0f527a97fa6dc82a70d7

7 years agoMerge "DO NOT MERGE: Visualizer: Check capture size and latency parameters" into...
Andy Hung [Thu, 10 Nov 2016 19:26:06 +0000 (19:26 +0000)]
Merge "DO NOT MERGE: Visualizer: Check capture size and latency parameters" into klp-dev am: f89590d009
am: 50f9a9faea

Change-Id: I2768ab9532953fde21bd10fcca5a509602e80553

7 years agoDO NOT MERGE: Visualizer: Check capture size and latency parameters am: 86cbc180f4
Andy Hung [Thu, 10 Nov 2016 19:25:50 +0000 (19:25 +0000)]
DO NOT MERGE: Visualizer: Check capture size and latency parameters am: 86cbc180f4
am: ce8b7cd373

Change-Id: I2afd4ba46fd6d62c3e89e49ec826ef7d683b324a

7 years agoMerge "Effects: Check get parameter command size" into klp-dev
Andy Hung [Thu, 10 Nov 2016 19:20:32 +0000 (19:20 +0000)]
Merge "Effects: Check get parameter command size" into klp-dev
am: c5768d0921

Change-Id: Ibd53fe698f492b7b4bb02181c8dda355a7485990

7 years agoEffects: Check get parameter command size
Andy Hung [Thu, 10 Nov 2016 19:20:29 +0000 (19:20 +0000)]
Effects: Check get parameter command size
am: 3d34cc76e3

Change-Id: Iacc05ef6b8fd1e906daaa3fd0b39c39049b47a0c

7 years agoMerge "DO NOT MERGE: Visualizer: Check capture size and latency parameters" into...
Andy Hung [Thu, 10 Nov 2016 19:19:52 +0000 (19:19 +0000)]
Merge "DO NOT MERGE: Visualizer: Check capture size and latency parameters" into klp-dev
am: f89590d009

Change-Id: I8a9006c295b1a4b5759be649432a93851d66efc6

7 years agoDO NOT MERGE: Visualizer: Check capture size and latency parameters
Andy Hung [Thu, 10 Nov 2016 19:19:51 +0000 (19:19 +0000)]
DO NOT MERGE: Visualizer: Check capture size and latency parameters
am: 86cbc180f4

Change-Id: Ieefd729dc4b90ecaba5bd7684b940ec70f9203b5

7 years agoMerge "Effects: Check get parameter command size" into klp-dev
Andy Hung [Thu, 10 Nov 2016 19:16:40 +0000 (19:16 +0000)]
Merge "Effects: Check get parameter command size" into klp-dev

7 years agoMerge "Visualizer: Check capture size and latency parameters" into lmp-dev
Andy Hung [Thu, 10 Nov 2016 19:15:01 +0000 (19:15 +0000)]
Merge "Visualizer: Check capture size and latency parameters" into lmp-dev

7 years agoMerge "DO NOT MERGE: Visualizer: Check capture size and latency parameters" into...
Andy Hung [Thu, 10 Nov 2016 19:13:24 +0000 (19:13 +0000)]
Merge "DO NOT MERGE: Visualizer: Check capture size and latency parameters" into klp-dev

7 years agoMerge "Fix security vulnerability: Equalizer command might allow negative indexes...
Ricardo Garcia [Wed, 9 Nov 2016 19:36:32 +0000 (19:36 +0000)]
Merge "Fix security vulnerability: Equalizer command might allow negative indexes" into klp-dev am: fc6faebb08 am: ef01da120b
am: dc3b5edb63

Change-Id: Ic7eaa2e7cc04107dd9eac4674aa3f8d7bfd283a3

7 years agoFix security vulnerability: Equalizer command might allow negative indexes am: e981cc...
rago [Wed, 9 Nov 2016 19:36:16 +0000 (19:36 +0000)]
Fix security vulnerability: Equalizer command might allow negative indexes am: e981cca9ff am: 8fb8275471
am: 6b4cf2c0d3

Change-Id: I88ed7d46bb8d54dcb2309b103dd6fcf787ba3269

7 years agoMerge "Fix security vulnerability: Equalizer command might allow negative indexes...
Ricardo Garcia [Wed, 9 Nov 2016 19:31:02 +0000 (19:31 +0000)]
Merge "Fix security vulnerability: Equalizer command might allow negative indexes" into klp-dev am: fc6faebb08
am: ef01da120b

Change-Id: I6cf6ce34535fd3120b9865c27dce39b043e595fc

7 years agoFix security vulnerability: Equalizer command might allow negative indexes am: e981cca9ff
rago [Wed, 9 Nov 2016 19:30:47 +0000 (19:30 +0000)]
Fix security vulnerability: Equalizer command might allow negative indexes am: e981cca9ff
am: 8fb8275471

Change-Id: Iba4ca7302804912646e8c510d2e436ebbf8373aa

7 years agoMerge "Fix security vulnerability: Equalizer command might allow negative indexes...
Ricardo Garcia [Wed, 9 Nov 2016 19:25:17 +0000 (19:25 +0000)]
Merge "Fix security vulnerability: Equalizer command might allow negative indexes" into klp-dev
am: fc6faebb08

Change-Id: I8f81e75106cecd69eb8942dea1c375ce7aa729fd

7 years agoFix security vulnerability: Equalizer command might allow negative indexes
rago [Wed, 9 Nov 2016 19:25:16 +0000 (19:25 +0000)]
Fix security vulnerability: Equalizer command might allow negative indexes
am: e981cca9ff

Change-Id: I8355da91fab0d63fab72e05ba907708a3f3fe9c8

7 years agoMerge "Fix security vulnerability: Equalizer command might allow negative indexes...
Ricardo Garcia [Wed, 9 Nov 2016 19:14:34 +0000 (19:14 +0000)]
Merge "Fix security vulnerability: Equalizer command might allow negative indexes" into klp-dev

7 years agoDO NOT MERGE: defensive parsing of mp3 album art information am: 2ff80538b7 am: c3819...
Ray Essick [Wed, 9 Nov 2016 18:33:12 +0000 (18:33 +0000)]
DO NOT MERGE: defensive parsing of mp3 album art information am: 2ff80538b7 am: c3819cfda9
am: c696d76d98  -s ours

Change-Id: I80f50a474af40a2ea3c732604e77caef6afadf46

7 years agoDO NOT MERGE: defensive parsing of mp3 album art information am: 2ff80538b7
Ray Essick [Wed, 9 Nov 2016 18:27:11 +0000 (18:27 +0000)]
DO NOT MERGE: defensive parsing of mp3 album art information am: 2ff80538b7
am: c3819cfda9

Change-Id: I2a98a164f3c1d728e0f5bec906116cd1bffac19a

7 years agoDO NOT MERGE: defensive parsing of mp3 album art information
Ray Essick [Wed, 9 Nov 2016 18:21:12 +0000 (18:21 +0000)]
DO NOT MERGE: defensive parsing of mp3 album art information
am: 2ff80538b7

Change-Id: I864307c871b8ab48fd0fe2ddaba2e6ead0f0233a

7 years agoEffects: Check get parameter command size
Andy Hung [Sat, 5 Nov 2016 02:40:53 +0000 (19:40 -0700)]
Effects: Check get parameter command size

Test: Custom test.
Bug: 32438594
Bug: 32624850
Bug: 32635664
Change-Id: I9b1315e2c02f11bea395bfdcf5c1ccddccbad8a6

7 years agoDO NOT MERGE: defensive parsing of mp3 album art information
Ray Essick [Wed, 2 Nov 2016 21:16:28 +0000 (14:16 -0700)]
DO NOT MERGE: defensive parsing of mp3 album art information

several points in stagefrights mp3 album art code
used strlen() to parse user-supplied strings that may be
unterminated, resulting in reading beyond the end of a buffer.

This changes the code to use strnlen() for 8-bit encodings and
strengthens the parsing of 16-bit encodings similarly. It also
reworks how we watch for the end-of-buffer to avoid all over-reads.

Bug: 32377688
Test: crafted mp3's w/ good/bad cover art. See what showed in play music
Change-Id: I479d51e88d3180461cb6ea5540974671cfd84201

7 years agoDO NOT MERGE: defensive parsing of mp3 album art information
Ray Essick [Wed, 2 Nov 2016 21:15:43 +0000 (14:15 -0700)]
DO NOT MERGE: defensive parsing of mp3 album art information

several points in stagefrights mp3 album art code
used strlen() to parse user-supplied strings that may be
unterminated, resulting in reading beyond the end of a buffer.

This changes the code to use strnlen() for 8-bit encodings and
strengthens the parsing of 16-bit encodings similarly. It also
reworks how we watch for the end-of-buffer to avoid all over-reads.

Bug: 32377688
Test: crafted mp3's w/ good/bad cover art. See what showed in play music
Change-Id: Idbaf221fa2283b33e83f399562a3323dd095cc2c

7 years agoFix security vulnerability: Equalizer command might allow negative indexes
rago [Mon, 31 Oct 2016 19:50:20 +0000 (12:50 -0700)]
Fix security vulnerability: Equalizer command might allow negative indexes

Bug: 32247948
Bug: 32438598
Bug: 32436341

Test: use POC on bug or cts security test

Change-Id: I91bd6aadb6c7410163e03101f365db767f4cd2a3
(cherry picked from commit 0872b65cff9129633471945431b9a5a28418049c)

7 years agoDO NOT MERGE: Visualizer: Check capture size and latency parameters
Andy Hung [Wed, 19 Oct 2016 00:13:09 +0000 (17:13 -0700)]
DO NOT MERGE: Visualizer: Check capture size and latency parameters

Bug: 31781965
Change-Id: I1c439a0d0f6aa0057b3c651499f28426e1e1f5e4

7 years agoVisualizer: Check capture size and latency parameters
Andy Hung [Wed, 19 Oct 2016 00:13:09 +0000 (17:13 -0700)]
Visualizer: Check capture size and latency parameters

Bug: 31781965
Change-Id: I1c439a0d0f6aa0057b3c651499f28426e1e1f5e4

7 years agoMerge "Fix divide by zero" into lmp-dev
Marco Nelissen [Fri, 14 Oct 2016 22:02:31 +0000 (22:02 +0000)]
Merge "Fix divide by zero" into lmp-dev

7 years agoMerge "DO NOT MERGE Fix divide by zero" into klp-dev am: 2c28e5b126 am: a5477b11be
Marco Nelissen [Thu, 13 Oct 2016 23:30:30 +0000 (23:30 +0000)]
Merge "DO NOT MERGE Fix divide by zero" into klp-dev am: 2c28e5b126 am: a5477b11be
am: 913b7564c4  -s ours

Change-Id: I9698f264d5285632c8f7f7d83726da35499f290e

7 years agoDO NOT MERGE Fix divide by zero am: febbd52cd9 am: 55ce7e5d1e
Marco Nelissen [Thu, 13 Oct 2016 23:30:16 +0000 (23:30 +0000)]
DO NOT MERGE Fix divide by zero am: febbd52cd9 am: 55ce7e5d1e
am: 1b3f61ceaf  -s ours

Change-Id: Iaf8f9526bbb01eca75ded491f2dd43baabaee22e

7 years agoMerge "DO NOT MERGE Fix divide by zero" into klp-dev am: 2c28e5b126
Marco Nelissen [Thu, 13 Oct 2016 23:28:29 +0000 (23:28 +0000)]
Merge "DO NOT MERGE Fix divide by zero" into klp-dev am: 2c28e5b126
am: a5477b11be

Change-Id: I23bc38094b99e0563a4aeeb7df08631212d0b73a

7 years agoDO NOT MERGE Fix divide by zero am: febbd52cd9
Marco Nelissen [Thu, 13 Oct 2016 23:28:17 +0000 (23:28 +0000)]
DO NOT MERGE Fix divide by zero am: febbd52cd9
am: 55ce7e5d1e

Change-Id: I792667b35aacfa1b910a332d855f002615041408

7 years agoMerge "DO NOT MERGE Fix divide by zero" into klp-dev
Marco Nelissen [Thu, 13 Oct 2016 23:25:47 +0000 (23:25 +0000)]
Merge "DO NOT MERGE Fix divide by zero" into klp-dev
am: 2c28e5b126

Change-Id: Ic69824aeaf760eb6b5e79fef78be41c2cb4d749e

7 years agoDO NOT MERGE Fix divide by zero
Marco Nelissen [Thu, 13 Oct 2016 23:25:47 +0000 (23:25 +0000)]
DO NOT MERGE Fix divide by zero
am: febbd52cd9

Change-Id: I229ab9fee73b63493c4e61493de6183857ef886a

7 years agoFix divide by zero
Marco Nelissen [Thu, 6 Oct 2016 22:31:52 +0000 (15:31 -0700)]
Fix divide by zero

and be stricter about the layout of various boxes in mp4 files.

Bug: 31318219
Change-Id: I50034d5b6b1967ca6e88aabeacf49f26ba3c0d32

7 years agoMerge "DO NOT MERGE Fix divide by zero" into klp-dev
Marco Nelissen [Thu, 13 Oct 2016 23:19:54 +0000 (23:19 +0000)]
Merge "DO NOT MERGE Fix divide by zero" into klp-dev

7 years agoMerge "Fix potential NULL dereference in Visualizer effect" into klp-dev am: eee86b00...
Ricardo Garcia [Thu, 13 Oct 2016 01:33:30 +0000 (01:33 +0000)]
Merge "Fix potential NULL dereference in Visualizer effect" into klp-dev am: eee86b009e am: 6732f45ee9
am: 24566f2939

Change-Id: Ibfc04cf102256f0a114b9670550beee44254be14

7 years agoFix potential NULL dereference in Visualizer effect am: 874f9e0b8e am: f060479b9a
rago [Thu, 13 Oct 2016 01:33:18 +0000 (01:33 +0000)]
Fix potential NULL dereference in Visualizer effect am: 874f9e0b8e am: f060479b9a
am: bcc7230bb9

Change-Id: If5d6fefb276341472d827bac3f349561f7d1d990

7 years agoMerge "Fix potential NULL dereference in Visualizer effect" into klp-dev am: eee86b009e
Ricardo Garcia [Thu, 13 Oct 2016 01:26:59 +0000 (01:26 +0000)]
Merge "Fix potential NULL dereference in Visualizer effect" into klp-dev am: eee86b009e
am: 6732f45ee9

Change-Id: Ic59a0ab61486e1a420988653e4276b3f5e660729

7 years agoFix potential NULL dereference in Visualizer effect am: 874f9e0b8e
rago [Thu, 13 Oct 2016 01:26:47 +0000 (01:26 +0000)]
Fix potential NULL dereference in Visualizer effect am: 874f9e0b8e
am: f060479b9a

Change-Id: I69eb3819f246e6d807af099f9a0260146cd06fd2

7 years agoMerge "Fix potential NULL dereference in Visualizer effect" into klp-dev
Ricardo Garcia [Thu, 13 Oct 2016 01:19:49 +0000 (01:19 +0000)]
Merge "Fix potential NULL dereference in Visualizer effect" into klp-dev
am: eee86b009e

Change-Id: Id6c3168ccbf272646f123090ab4fadab34b0f728

7 years agoFix potential NULL dereference in Visualizer effect
rago [Thu, 13 Oct 2016 01:19:48 +0000 (01:19 +0000)]
Fix potential NULL dereference in Visualizer effect
am: 874f9e0b8e

Change-Id: I382b8cc3799b52e085aac0ccec7dcb668a4933ec

7 years agoMerge "Fix potential NULL dereference in Visualizer effect" into klp-dev
Ricardo Garcia [Thu, 13 Oct 2016 01:13:46 +0000 (01:13 +0000)]
Merge "Fix potential NULL dereference in Visualizer effect" into klp-dev

7 years agoMerge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into...
Pawin Vongmasa [Thu, 13 Oct 2016 01:12:59 +0000 (01:12 +0000)]
Merge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into klp-dev am: 8caef85235 am: b512f4ab42
am: d18d8fac61  -s ours

Change-Id: I4b99c669b012bde7631699d5e7ef0da874cc14d4

7 years agoDO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing. am: de84a76b86...
Pawin Vongmasa [Thu, 13 Oct 2016 01:12:46 +0000 (01:12 +0000)]
DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing. am: de84a76b86 am: 2c76c56d56
am: f1e84ca858  -s ours

Change-Id: I7b0abee027d5cc3e697b3afcbf8412641f963ad3