OSDN Git Service

android-x86/frameworks-av.git
7 years agoEffectBundle: check nb channels to write speaker angles am: e5a54485e0 am: b0896dfc81
Jean-Michel Trivi [Tue, 14 Feb 2017 20:56:27 +0000 (20:56 +0000)]
EffectBundle: check nb channels to write speaker angles am: e5a54485e0 am: b0896dfc81
am: b9e070af6a

Change-Id: I1676f829b5571abad93c9f4ce156811a55787024

7 years agoEffectBundle: check nb channels to write speaker angles am: e5a54485e0
Jean-Michel Trivi [Tue, 14 Feb 2017 20:53:56 +0000 (20:53 +0000)]
EffectBundle: check nb channels to write speaker angles am: e5a54485e0
am: b0896dfc81

Change-Id: I1996ca7d273dcf04729c8cc6ed7898899240b3c2

7 years agoEffectBundle: check nb channels to write speaker angles
Jean-Michel Trivi [Tue, 14 Feb 2017 20:51:25 +0000 (20:51 +0000)]
EffectBundle: check nb channels to write speaker angles
am: e5a54485e0

Change-Id: I131f8d196034854f562a175874bce19b29904664

7 years agoEffectBundle: check nb channels to write speaker angles
Jean-Michel Trivi [Tue, 14 Feb 2017 00:31:20 +0000 (16:31 -0800)]
EffectBundle: check nb channels to write speaker angles

When speaker angles are queried, the size of the array for the
  returned data is 3x the number of channels (where really it
  should be max(2, nbChannels)). The code assumed it was at
  least 3x2 (where 2 is the number of virtual speakers this
  effect supports) and would thus crash when called for a mono
  channel mask.

Test: see repro steps in bug
Bug: 32591350
Change-Id: I33d4bff6b2e19a9fc4284a85a446804878d3a410

7 years agoMerge "Fix overflow check and check read result" into klp-dev am: b6aa3901ce am:...
Marco Nelissen [Mon, 13 Feb 2017 23:08:44 +0000 (23:08 +0000)]
Merge "Fix overflow check and check read result" into klp-dev am: b6aa3901ce am: e541fa1764 am: 7f3980c0ca am: ea2023406b am: 3fc94bc146
am: 497f2ccce4

Change-Id: I2df07a6aa02a7c56a47c777e0eacbc6d560055de

7 years agoresolve merge conflicts of 79cf158c51 to mnc-dev
Marco Nelissen [Mon, 13 Feb 2017 22:19:40 +0000 (14:19 -0800)]
resolve merge conflicts of 79cf158c51 to mnc-dev

Change-Id: Ied32e83215e386c801c02991a0b2fa4baa25b643

7 years agoMerge "Fix overflow check and check read result" into klp-dev am: b6aa3901ce am:...
Marco Nelissen [Mon, 13 Feb 2017 21:51:48 +0000 (21:51 +0000)]
Merge "Fix overflow check and check read result" into klp-dev am: b6aa3901ce am: e541fa1764 am: 7f3980c0ca am: ea2023406b
am: 3fc94bc146

Change-Id: Ic4fd03ad338902c15048dd32e8a2f27d162d6255

7 years agoMerge "stagefright: parseApp check data boundary conditions" into klp-dev am: 65433ff...
Marco Nelissen [Mon, 13 Feb 2017 21:51:31 +0000 (21:51 +0000)]
Merge "stagefright: parseApp check data boundary conditions" into klp-dev am: 65433ff04d am: 86bd734f58 am: 7902138f2e am: a23c9a47ab
am: f8a2e81bc4

Change-Id: I64518f5a3860f66d3e232589f8c9ef643e572053

7 years agoMerge "Fix overflow check and check read result" into klp-dev am: b6aa3901ce am:...
Marco Nelissen [Mon, 13 Feb 2017 21:49:17 +0000 (21:49 +0000)]
Merge "Fix overflow check and check read result" into klp-dev am: b6aa3901ce am: e541fa1764 am: 7f3980c0ca
am: ea2023406b

Change-Id: I68fa183d94f46f7578f8b0718da9a3efd9b4946c

7 years agoMerge "stagefright: parseApp check data boundary conditions" into klp-dev am: 65433ff...
Marco Nelissen [Mon, 13 Feb 2017 21:49:03 +0000 (21:49 +0000)]
Merge "stagefright: parseApp check data boundary conditions" into klp-dev am: 65433ff04d am: 86bd734f58 am: 7902138f2e
am: a23c9a47ab

Change-Id: I4cfef0f49e467337c36b9283d2959ddd68e41bd3

7 years agoMerge "Fix overflow check and check read result" into klp-dev am: b6aa3901ce am:...
Marco Nelissen [Mon, 13 Feb 2017 21:46:48 +0000 (21:46 +0000)]
Merge "Fix overflow check and check read result" into klp-dev am: b6aa3901ce am: e541fa1764
am: 7f3980c0ca

Change-Id: Iaa2a11e1924fdcfe83ca8c8e9a7925850ceb53be

7 years agoMerge "stagefright: parseApp check data boundary conditions" into klp-dev am: 65433ff...
Marco Nelissen [Mon, 13 Feb 2017 21:46:33 +0000 (21:46 +0000)]
Merge "stagefright: parseApp check data boundary conditions" into klp-dev am: 65433ff04d am: 86bd734f58
am: 7902138f2e

Change-Id: I2d9be870193a986d9cd21d7527c4069cd1f184ed

7 years agoMerge "Fix overflow check and check read result" into klp-dev am: b6aa3901ce
Marco Nelissen [Mon, 13 Feb 2017 21:43:48 +0000 (21:43 +0000)]
Merge "Fix overflow check and check read result" into klp-dev am: b6aa3901ce
am: e541fa1764

Change-Id: Ia2962471693b1c4302d4535a0f95dd8d914c3cb8

7 years agoMerge "stagefright: parseApp check data boundary conditions" into klp-dev am: 65433ff04d
Marco Nelissen [Mon, 13 Feb 2017 21:43:31 +0000 (21:43 +0000)]
Merge "stagefright: parseApp check data boundary conditions" into klp-dev am: 65433ff04d
am: 86bd734f58

Change-Id: I3729ea0064642ac10292561d450565ee735af369

7 years agoMerge "Fix overflow check and check read result" into klp-dev
Marco Nelissen [Mon, 13 Feb 2017 21:41:14 +0000 (21:41 +0000)]
Merge "Fix overflow check and check read result" into klp-dev
am: b6aa3901ce

Change-Id: I80ef33d8f0593fa723077e91a5ca406f27b0b746

7 years agoMerge "stagefright: parseApp check data boundary conditions" into klp-dev
Marco Nelissen [Mon, 13 Feb 2017 21:40:59 +0000 (21:40 +0000)]
Merge "stagefright: parseApp check data boundary conditions" into klp-dev
am: 65433ff04d

Change-Id: I6be526b6ed9df22c9699445efaa4f0ed2ae266b4

7 years agoMerge "Fix overflow check and check read result" into klp-dev
Marco Nelissen [Mon, 13 Feb 2017 21:36:48 +0000 (21:36 +0000)]
Merge "Fix overflow check and check read result" into klp-dev

7 years agoMerge "stagefright: parseApp check data boundary conditions" into klp-dev
Marco Nelissen [Mon, 13 Feb 2017 21:35:18 +0000 (21:35 +0000)]
Merge "stagefright: parseApp check data boundary conditions" into klp-dev

7 years agoFix overflow check and check read result
Marco Nelissen [Mon, 6 Feb 2017 22:12:30 +0000 (14:12 -0800)]
Fix overflow check and check read result

Bug: 33861560
Test: build
Change-Id: Ia85519766e19a6e37237166f309750b3e8323c4e

7 years agoMerge "CameraBase: Don't return an sp<> by reference" into klp-dev am: fdf64bab96...
Eino-Ville Talvala [Fri, 3 Feb 2017 00:00:06 +0000 (00:00 +0000)]
Merge "CameraBase: Don't return an sp<> by reference" into klp-dev am: fdf64bab96 am: 4fca12e56f am: f0009384d8 am: 7a14d95270 am: 888f5bab6d
am: a6b1816e16

Change-Id: I4a4a4f1d70012375d5772e97dd23301231734f6b

7 years agoCameraBase: Don't return an sp<> by reference am: 4b49489c12 am: 8c32699ceb am: 8806c...
Eino-Ville Talvala [Fri, 3 Feb 2017 00:00:02 +0000 (00:00 +0000)]
CameraBase: Don't return an sp<> by reference am: 4b49489c12 am: 8c32699ceb am: 8806c2a11d am: 99c4dd2fe8 am: dd82ab2377
am: 1dd068cd45

Change-Id: Ie5afd6dc9b89c0dc22a2cef6e0ca6a9921921538

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

Change-Id: I6e99058d1122fad6a723662ad98d9e33c060e34c

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

Change-Id: I068a2fbc0e5bf20adb92ac4e95817899a3d53298

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

Change-Id: I42cf5ca9442728273ff2d90095b6d1520c75762a

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

Change-Id: I7fd189d89b4a0ddb91a7f21485d97dabee9b784e

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:36:23 +0000 (21:36 +0000)]
Revert "Turn off overflow protection for various math functions" am: 2dd1d5e02e am: aa5498018f am: ce9cab33b7 am: 4c1ad41c8b am: bd91a6540d
am: 08ccbcc16f

Change-Id: I7e920284bf69cc450d36f813e7e001ae30f656ee

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

Change-Id: Idafa3a702149b0dff4c8e6460a7ccfe342da1160

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

Change-Id: I7a754e278cdc719a0bf6543f8a2accbc43301f86

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 agoTurn off overflow protection for various math functions am: cbf5e6915c am: 72b1fdbf49...
Marco Nelissen [Thu, 2 Feb 2017 19:44:23 +0000 (19:44 +0000)]
Turn off overflow protection for various math functions am: cbf5e6915c am: 72b1fdbf49 am: a25eb35608 am: 3d58f94eec am: 1edbc699b5
am: c0118375e5

Change-Id: Ie92b4cba6575ce1c01f96ac19d4b6cd79392a19c

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

Change-Id: Ibcef66b9fa5eeffd3f77e3d6da5fea1556f36113

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:39:34 +0000 (19:39 +0000)]
Turn off overflow protection for various math functions am: cbf5e6915c am: 72b1fdbf49 am: a25eb35608
am: 3d58f94eec

Change-Id: I6be57dc624b46c1517fab973f34dd98b7d808a28

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 am: 91fe76a157 am: f79f26d257
Robert Shih [Mon, 30 Jan 2017 19:50:10 +0000 (19:50 +0000)]
avc_utils: skip empty NALs from malformed bistreams am: 91fe76a157 am: f79f26d257
am: 2b5d2c4a10

Change-Id: Idf43a017719d40c95e5a353985915ff80c02c0e2

7 years agoavc_utils: skip empty NALs from malformed bistreams am: 91fe76a157
Robert Shih [Mon, 30 Jan 2017 19:48:13 +0000 (19:48 +0000)]
avc_utils: skip empty NALs from malformed bistreams am: 91fe76a157
am: f79f26d257

Change-Id: I25e94c3a8cf32c58a74a9af9afb8bc46a275543f

7 years agoavc_utils: skip empty NALs from malformed bistreams
Robert Shih [Mon, 30 Jan 2017 19:46:10 +0000 (19:46 +0000)]
avc_utils: skip empty NALs from malformed bistreams
am: 91fe76a157

Change-Id: I4fc3e40dbfe2839611265ba178a9f35e05bcc28a

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 agostagefright: parseApp check data boundary conditions
Mark Salyzyn [Mon, 23 Jun 2014 21:13:22 +0000 (14:13 -0700)]
stagefright: parseApp check data boundary conditions

Test: compile, no poc for boundary violation.
Bug: 34056274
Change-Id: I23f5ccba8f211e01d9a3a741c8ea537b55aab4e2

7 years agoDO NOT MERGE - improve audio effect framwework thread safety am: 7da83aadf4
Eric Laurent [Wed, 18 Jan 2017 17:26:19 +0000 (17:26 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety am: 7da83aadf4
am: 5717bb1acb  -s ours

Change-Id: I52dedef569daef7a901ac924575b04c06e431ee0

7 years agoDO NOT MERGE - improve audio effect framwework thread safety
Eric Laurent [Wed, 18 Jan 2017 17:19:50 +0000 (17:19 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety
am: 7da83aadf4

Change-Id: I39621a0f71df766342b5b768fce1eb524ae5adcd

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
(cherry picked from commit 84c392104e905bfacc753ec0ddb96ce7813d1889)

7 years agoDon't CHECK when buffer is too large am: c2f0c73bfc am: acb7186e6e am: 0a4db601b4...
Marco Nelissen [Tue, 17 Jan 2017 19:14:26 +0000 (19:14 +0000)]
Don't CHECK when buffer is too large am: c2f0c73bfc am: acb7186e6e am: 0a4db601b4 am: 8474c51aaf am: a5333c0056
am: 7e5936e666

Change-Id: I8f4d5bb31a2600f6679d21fed9ebc02c2a3e3521

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

Change-Id: I572634a3e7e9161d0f6811adf83d37178e3895c3

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

Change-Id: I8a151eff3d02600134c929754c1420353f6a6ab1

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 am: a9660fe122 am: 22386993b5
Marco Nelissen [Sat, 14 Jan 2017 02:36:54 +0000 (02:36 +0000)]
Don't initialize sync sample parameters until the end am: a9660fe122 am: 22386993b5
am: 902d8e90cc

Change-Id: I6ba553f3ac3f04ef983e498756a19718b04f5206

7 years agoDon't initialize sync sample parameters until the end am: a9660fe122
Marco Nelissen [Sat, 14 Jan 2017 02:34:21 +0000 (02:34 +0000)]
Don't initialize sync sample parameters until the end am: a9660fe122
am: 22386993b5

Change-Id: Ia743be4048c57929c59b06a12b53f993b5b00111

7 years agoDon't initialize sync sample parameters until the end
Marco Nelissen [Sat, 14 Jan 2017 02:31:51 +0000 (02:31 +0000)]
Don't initialize sync sample parameters until the end
am: a9660fe122

Change-Id: Ia072f16604c3e766d4d2cdc49b88efcf182ca5f7

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:27:59 +0000 (22:27 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety am: b47a5ab107 am: 26cf2f4d73 am: 73a152960b  -s ours am: 21d6eafd26  -s ours am: 6c5deab4f2
am: 9685820100  -s ours

Change-Id: I84f3371cf4ac96e94b7f321b25fe51cf5e0cf4af

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

Change-Id: I680ead77538594903bc5140f68eeb920a7ac39c0

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

Change-Id: I8ad30b3c76e746ed85dde65a841ebb17af519ce6

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: 84c392104e -s ours...
Eric Laurent [Wed, 4 Jan 2017 22:18:00 +0000 (22:18 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety am: 84c392104e  -s ours am: 5d5f9cd28a
am: 10f61954ba  -s ours

Change-Id: I8c86f95b8f3bdb4c20372207c55bffe9a43b5dbb

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 am: 84c392104e -s ours
Eric Laurent [Wed, 4 Jan 2017 22:15:59 +0000 (22:15 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety am: 84c392104e  -s ours
am: 5d5f9cd28a

Change-Id: I3f732f9e0c346c0e7989e22401062011ef7c7ed2

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 [Wed, 4 Jan 2017 22:12:58 +0000 (22:12 +0000)]
DO NOT MERGE - improve audio effect framwework thread safety
am: 84c392104e  -s ours

Change-Id: Ia65e289c7383406c719226e8f404b392ca4303b2

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 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:47:21 +0000 (00:47 +0000)]
Merge "Effect: Use local cached data for Effect commit" into klp-dev am: 1576f5968c am: 308e51173e am: 94d5167a91 am: 98c2151dc3 am: 110d4d31b3
am: 71840c6a36

Change-Id: Idcef3a5a9a0adb89bcffa1c5e1b4e0bcbd7fb880

7 years agoEffect: Use local cached data for Effect commit am: dd79ccda92 am: 82c8c7656f am...
Andy Hung [Sat, 3 Dec 2016 00:47:04 +0000 (00:47 +0000)]
Effect: Use local cached data for Effect commit am: dd79ccda92 am: 82c8c7656f am: 9851dee7da am: 4242950061 am: a661c82829
am: b45c856249

Change-Id: I6cb0c8e2dbaa2ebe3d4fd4f283a2028ac099f3c3

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

Change-Id: Id0e2e230e2ccd08f46cfd33cab5d7585e9623cf0

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

Change-Id: I8318ec70f93d1ed10b5606511eb2d1885121f355

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

Change-Id: I0105fd0ddab374f8d1e95cc9e45af094367edd30

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

Change-Id: I9cee35a3c8df1747c5461dc62c3210a0de134b87

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:38:50 +0000 (19:38 +0000)]
Fix security vulnerability: potential OOB write in audioserver am: e275907e57 am: 01e854056a am: 3e8ab60b7f am: 9161586309 am: ad29b47d91
am: 8b9b199891

Change-Id: Id1d62d9ebabab42f5ca82ff2fbbcf14d130466f4

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

Change-Id: I7ea2eaa2b1fb4cf652b702e847b2a83e777858ef

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

Change-Id: Ibcceb08d7db77f67f3dfc3cdad1d2bd6994183ae

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 [Wed, 16 Nov 2016 00:04:03 +0000 (00:04 +0000)]
Merge "Fix security vulnerability: Effect command might allow negative indexes" into klp-dev am: 501aee7a54 am: dd269152c4 am: 756f8dcdc1 am: 8b850ec8d5 am: b926fff90e
am: ea841facc8

Change-Id: Id093997f3ff58f89ec5aced7006d34201ae52ecd