OSDN Git Service

android-x86/frameworks-av.git
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

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

Change-Id: Ic852128c935782783fc03175be9968da6e894e90

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

Change-Id: I24c8963da1f34e724213bbb896722a06d1eca378

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

Change-Id: I9b4b155c4a720b27120428ea995833c426a65fef

7 years agoDO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing.
Pawin Vongmasa [Thu, 13 Oct 2016 00:59:46 +0000 (00:59 +0000)]
DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing.
am: de84a76b86

Change-Id: I7bfde467167616b191ac1d75f3ea08f1ba78089b

7 years agoMerge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into...
Pawin Vongmasa [Thu, 13 Oct 2016 00:47:49 +0000 (00:47 +0000)]
Merge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into lmp-dev

7 years agoMerge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into...
Pawin Vongmasa [Thu, 13 Oct 2016 00:47:33 +0000 (00:47 +0000)]
Merge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into klp-dev

7 years agoFix potential NULL dereference in Visualizer effect
rago [Sat, 8 Oct 2016 01:16:09 +0000 (18:16 -0700)]
Fix potential NULL dereference in Visualizer effect

Bug: 30229821

Test: fixing CL. Existing unit tests still pass.

Change-Id: I6e4abd759d5d2abc3b391e92e2e18f060cab7af0

7 years agostagefright: don't fail MediaCodec.configure if clients use store-meta key am: afb20c...
Lajos Molnar [Tue, 11 Oct 2016 23:04:42 +0000 (23:04 +0000)]
stagefright: don't fail MediaCodec.configure if clients use store-meta key am: afb20c3102 am: d9f6b22189
am: 1c44a2ed66

Change-Id: I5ef2909336c4264e22c4216b64fccc46ea654c19

7 years agostagefright: don't fail MediaCodec.configure if clients use store-meta key am: afb20c3102
Lajos Molnar [Tue, 11 Oct 2016 22:58:40 +0000 (22:58 +0000)]
stagefright: don't fail MediaCodec.configure if clients use store-meta key am: afb20c3102
am: d9f6b22189

Change-Id: If02cd075a28e4b96fa1c311547a8837d67e848d5

7 years agostagefright: don't fail MediaCodec.configure if clients use store-meta key
Lajos Molnar [Tue, 11 Oct 2016 22:53:10 +0000 (22:53 +0000)]
stagefright: don't fail MediaCodec.configure if clients use store-meta key
am: afb20c3102

Change-Id: Ia68b31d3e1781cb24e0c16f669a6b26644f33d46

7 years agostagefright: don't fail MediaCodec.configure if clients use store-meta key
Lajos Molnar [Tue, 11 Oct 2016 15:41:51 +0000 (08:41 -0700)]
stagefright: don't fail MediaCodec.configure if clients use store-meta key

Even though storing metadata is not supported in MediaCodec.configure and
is only meant to be used by Stagefright recorder, don't fail configure.

Bug: 31986922
Change-Id: Id9f083be6e857e7a0d8d4a74159be5b8894e28be

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

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

Bug: 31318219
Change-Id: I50034d5b6b1967ca6e88aabeacf49f26ba3c0d32

7 years agoDO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing.
Pawin Vongmasa [Fri, 30 Sep 2016 07:45:52 +0000 (00:45 -0700)]
DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing.

Bug: 31449945
Change-Id: If2708b3006c22393e80a2557f93d8a71e4e7bf16

7 years agoDO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing.
Pawin Vongmasa [Fri, 30 Sep 2016 09:44:54 +0000 (02:44 -0700)]
DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing.

Bug: 31449945
Change-Id: Icc5714bd2459c053c0a913b1c27d9ffbef5b2d2a

7 years agoMerge "SampleIterator: clear members on seekTo error" into klp-dev am: 610a9222d6...
Robert Shih [Thu, 22 Sep 2016 03:07:42 +0000 (03:07 +0000)]
Merge "SampleIterator: clear members on seekTo error" into klp-dev am: 610a9222d6 am: a78bd18c93
am: 9578341c41

Change-Id: Ia3bdadd25c957b6a5e3a1a7fe0e5e414ff510721

7 years agoSampleIterator: clear members on seekTo error am: 03237ce0f9 am: 8468b8980c
Robert Shih [Thu, 22 Sep 2016 03:07:28 +0000 (03:07 +0000)]
SampleIterator: clear members on seekTo error am: 03237ce0f9 am: 8468b8980c
am: e0d588b892

Change-Id: I62d47aa490a6fb62eabd5f80da26e47de69b8b1c

7 years agoMerge "SampleIterator: clear members on seekTo error" into klp-dev am: 610a9222d6
Robert Shih [Thu, 22 Sep 2016 00:43:10 +0000 (00:43 +0000)]
Merge "SampleIterator: clear members on seekTo error" into klp-dev am: 610a9222d6
am: a78bd18c93

Change-Id: Iec88e35a497a7503b589739082b86ae5bc0e2479

7 years agoSampleIterator: clear members on seekTo error am: 03237ce0f9
Robert Shih [Thu, 22 Sep 2016 00:42:56 +0000 (00:42 +0000)]
SampleIterator: clear members on seekTo error am: 03237ce0f9
am: 8468b8980c

Change-Id: I4d81b7bd8732f03d0308740b96418203d17cd65b

7 years agoMerge "SampleIterator: clear members on seekTo error" into klp-dev
Robert Shih [Thu, 22 Sep 2016 00:36:56 +0000 (00:36 +0000)]
Merge "SampleIterator: clear members on seekTo error" into klp-dev
am: 610a9222d6

Change-Id: I39efc9f85b13cb1212565b58f8907fd53b31920c

7 years agoSampleIterator: clear members on seekTo error
Robert Shih [Thu, 22 Sep 2016 00:36:55 +0000 (00:36 +0000)]
SampleIterator: clear members on seekTo error
am: 03237ce0f9

Change-Id: I0dd1251bd8f132b445ebf515e4555e9ec9953269

7 years agoMerge "SampleIterator: clear members on seekTo error" into klp-dev
Robert Shih [Thu, 22 Sep 2016 00:25:48 +0000 (00:25 +0000)]
Merge "SampleIterator: clear members on seekTo error" into klp-dev

7 years agoLimit mp4 atom size to something reasonable
Marco Nelissen [Mon, 19 Sep 2016 23:22:56 +0000 (16:22 -0700)]
Limit mp4 atom size to something reasonable

Bug: 28615448
Change-Id: I5916f6839b4a9bbee4388a106e7373bcd4154f5a

7 years agoMerge "Limit mp4 atom size to something reasonable" into klp-dev am: 9af51c59dc am...
Marco Nelissen [Wed, 21 Sep 2016 20:52:08 +0000 (20:52 +0000)]
Merge "Limit mp4 atom size to something reasonable" into klp-dev am: 9af51c59dc am: 3fb9e5b7cb
am: 085a4173eb

Change-Id: I0727b58843540b89c4e4668c1e7f2168d5fc7058

7 years agoLimit mp4 atom size to something reasonable am: 638c99bad6 am: 569f3db605
Marco Nelissen [Wed, 21 Sep 2016 20:51:33 +0000 (20:51 +0000)]
Limit mp4 atom size to something reasonable am: 638c99bad6 am: 569f3db605
am: 29ccd8c55d  -s ours

Change-Id: If514b12f86a85a90ff0835eeafa5a31324ec3c17

7 years agoMerge "Limit mp4 atom size to something reasonable" into klp-dev am: 9af51c59dc
Marco Nelissen [Wed, 21 Sep 2016 20:41:43 +0000 (20:41 +0000)]
Merge "Limit mp4 atom size to something reasonable" into klp-dev am: 9af51c59dc
am: 3fb9e5b7cb

Change-Id: Ibcb0e44db0ff0da658af399522266606171b6a2e

7 years agoLimit mp4 atom size to something reasonable am: 638c99bad6
Marco Nelissen [Wed, 21 Sep 2016 20:41:31 +0000 (20:41 +0000)]
Limit mp4 atom size to something reasonable am: 638c99bad6
am: 569f3db605

Change-Id: Icc063dd70e08fea6320e3d3f64ebbd4ba51d8aa8

7 years agoMerge "Limit mp4 atom size to something reasonable" into klp-dev
Marco Nelissen [Wed, 21 Sep 2016 20:39:01 +0000 (20:39 +0000)]
Merge "Limit mp4 atom size to something reasonable" into klp-dev
am: 9af51c59dc

Change-Id: Id16a06b7ec4fceac9ecec7ed3504fdf233095268

7 years agoLimit mp4 atom size to something reasonable
Marco Nelissen [Wed, 21 Sep 2016 20:39:01 +0000 (20:39 +0000)]
Limit mp4 atom size to something reasonable
am: 638c99bad6

Change-Id: I1284a0b7a44c5f7a8d88b931114e201d8cb09601

7 years agoMerge "Limit mp4 atom size to something reasonable" into klp-dev
Marco Nelissen [Wed, 21 Sep 2016 20:35:16 +0000 (20:35 +0000)]
Merge "Limit mp4 atom size to something reasonable" into klp-dev

7 years agoLimit mp4 atom size to something reasonable
Marco Nelissen [Mon, 19 Sep 2016 23:22:56 +0000 (16:22 -0700)]
Limit mp4 atom size to something reasonable

Bug: 28615448
Change-Id: I5916f6839b4a9bbee4388a106e7373bcd4154f5a

7 years agoCheck mprotect result am: 866c800c06 am: a0cfcf38d4
Marco Nelissen [Wed, 21 Sep 2016 14:44:02 +0000 (14:44 +0000)]
Check mprotect result am: 866c800c06 am: a0cfcf38d4
am: 638aca47be

Change-Id: I337dd1d62a4cd52de051afd4d9b919a742ad20fe

7 years agoCheck mprotect result am: 866c800c06
Marco Nelissen [Wed, 21 Sep 2016 14:41:28 +0000 (14:41 +0000)]
Check mprotect result am: 866c800c06
am: a0cfcf38d4

Change-Id: I0f188e2c717922689df42af21f6c47a865a8c390

7 years agoCheck mprotect result
Marco Nelissen [Wed, 21 Sep 2016 14:38:58 +0000 (14:38 +0000)]
Check mprotect result
am: 866c800c06

Change-Id: I7b20d72aafb9a95480c1a6b16f0cafc4d1749470

7 years agoSampleIterator: clear members on seekTo error
Robert Shih [Wed, 21 Sep 2016 00:37:55 +0000 (17:37 -0700)]
SampleIterator: clear members on seekTo error

Bug: 31091777
Change-Id: Iddf99d0011961d0fd3d755e57db4365b6a6a1193

7 years agoCheck mprotect result
Marco Nelissen [Tue, 20 Sep 2016 20:36:40 +0000 (13:36 -0700)]
Check mprotect result

mprotect can theoretically fail, which could then let one exploit
a vulnerable codec if one exists on the device.

Bug: 31350239
Change-Id: I7b99c190619f0fb2eb93119596e6da0d2deb8ba5

7 years agoMerge "Fix potential overflow in Visualizer effect" into klp-dev am: b602286952 am...
Ricardo Garcia [Tue, 20 Sep 2016 00:46:09 +0000 (00:46 +0000)]
Merge "Fix potential overflow in Visualizer effect" into klp-dev am: b602286952 am: f59ab362c5
am: d7822b3313

Change-Id: Iec66f66b4239b395253d757d57725ecd20320c13

7 years agoFix potential overflow in Visualizer effect am: 46dc714d52 am: 8720f85196
rago [Tue, 20 Sep 2016 00:46:03 +0000 (00:46 +0000)]
Fix potential overflow in Visualizer effect am: 46dc714d52 am: 8720f85196
am: bad0250dcb

Change-Id: I23660e1da14f232ff786f9ab78da3e26f301c1b2

7 years agoIOMX: do not clear buffer if it's allocated by component am: ea76573aa2 am: 86d9bb9141
Chong Zhang [Tue, 20 Sep 2016 00:45:37 +0000 (00:45 +0000)]
IOMX: do not clear buffer if it's allocated by component am: ea76573aa2 am: 86d9bb9141
am: dfe5b5193c

Change-Id: Ibd28b74deb652eb61b08e933a5e288d145841a14

7 years agoMerge "Fix potential overflow in Visualizer effect" into klp-dev am: b602286952
Ricardo Garcia [Tue, 20 Sep 2016 00:39:45 +0000 (00:39 +0000)]
Merge "Fix potential overflow in Visualizer effect" into klp-dev am: b602286952
am: f59ab362c5

Change-Id: I9b65bbed0946bb25b25772f24256dbe1f8fe022c

7 years agoFix potential overflow in Visualizer effect am: 46dc714d52
rago [Tue, 20 Sep 2016 00:39:33 +0000 (00:39 +0000)]
Fix potential overflow in Visualizer effect am: 46dc714d52
am: 8720f85196

Change-Id: I0803632824e6fc5a70ad6a1ba36743eb11cc3e7e

7 years agoIOMX: do not clear buffer if it's allocated by component am: ea76573aa2
Chong Zhang [Tue, 20 Sep 2016 00:39:03 +0000 (00:39 +0000)]
IOMX: do not clear buffer if it's allocated by component am: ea76573aa2
am: 86d9bb9141

Change-Id: Id27e600a2c500634cd56bb8367f8d7ce811d63e8

7 years agoMerge "Fix potential overflow in Visualizer effect" into klp-dev
Ricardo Garcia [Tue, 20 Sep 2016 00:35:07 +0000 (00:35 +0000)]
Merge "Fix potential overflow in Visualizer effect" into klp-dev
am: b602286952

Change-Id: Ic0cd9c82a5417e0281db38d806956876d95801fc

7 years agoFix potential overflow in Visualizer effect
rago [Tue, 20 Sep 2016 00:35:04 +0000 (00:35 +0000)]
Fix potential overflow in Visualizer effect
am: 46dc714d52

Change-Id: I61f5adb793d2c54c078211213b25fd7ea37a3895

7 years agoIOMX: do not clear buffer if it's allocated by component
Chong Zhang [Tue, 20 Sep 2016 00:29:11 +0000 (00:29 +0000)]
IOMX: do not clear buffer if it's allocated by component
am: ea76573aa2

Change-Id: Id77521c1d8a2e3c0f24b3467db0cea1907d5b934

7 years agoMerge "Fix potential overflow in Visualizer effect" into klp-dev
Ricardo Garcia [Tue, 20 Sep 2016 00:27:26 +0000 (00:27 +0000)]
Merge "Fix potential overflow in Visualizer effect" into klp-dev

7 years agoIOMX: do not clear buffer if it's allocated by component
Chong Zhang [Mon, 19 Sep 2016 22:29:04 +0000 (15:29 -0700)]
IOMX: do not clear buffer if it's allocated by component

The component might depends on their buffers to be initialized
in certain ways to work. Don't clear unless we're allocating it.

bug: 31586647
Change-Id: Ia0a125797e414998ef0cd8ce03672f5b1e0bbf7a

7 years agoIOMX: allow configuration after going to loaded state am: c13904014b am: 99accf6cdc
Lajos Molnar [Thu, 15 Sep 2016 22:41:53 +0000 (22:41 +0000)]
IOMX: allow configuration after going to loaded state am: c13904014b am: 99accf6cdc
am: 9a565c52b0

Change-Id: If2465b5f16cc58d5d0d7cda3e117ad863dafd479

7 years agoIOMX: allow configuration after going to loaded state am: c13904014b
Lajos Molnar [Thu, 15 Sep 2016 22:39:55 +0000 (22:39 +0000)]
IOMX: allow configuration after going to loaded state am: c13904014b
am: 99accf6cdc

Change-Id: I2f80600bad65948b26e839d8588b98a574ffba9b

7 years agoIOMX: allow configuration after going to loaded state
Lajos Molnar [Thu, 15 Sep 2016 22:36:52 +0000 (22:36 +0000)]
IOMX: allow configuration after going to loaded state
am: c13904014b

Change-Id: Ibc6e43830d08890077691ebd55b1515554b94053

7 years agoIOMX: allow configuration after going to loaded state
Lajos Molnar [Wed, 14 Sep 2016 17:01:37 +0000 (10:01 -0700)]
IOMX: allow configuration after going to loaded state

This was disallowed recently but we still use it as MediaCodcec.stop
only goes to loaded state, and does not free component.

Bug: 31450460
Change-Id: I72e092e4e55c9f23b1baee3e950d76e84a5ef28d

7 years agoMerge "SoundTrigger: get service by value." into lmp-dev
Eric Laurent [Tue, 13 Sep 2016 23:04:34 +0000 (23:04 +0000)]
Merge "SoundTrigger: get service by value." into lmp-dev