OSDN Git Service
TreeHugger Robot [Thu, 8 Jun 2017 08:08:25 +0000 (08:08 +0000)]
Merge "Bug fix: timestamp deviation fail test" into oc-dev
TreeHugger Robot [Thu, 8 Jun 2017 04:01:31 +0000 (04:01 +0000)]
Merge "Fix strides while extracting graphic buffer" into oc-dev
TreeHugger Robot [Thu, 8 Jun 2017 03:32:52 +0000 (03:32 +0000)]
Merge "configure port format" into oc-dev
Ram Mohan [Tue, 6 Jun 2017 12:36:18 +0000 (18:06 +0530)]
configure port format
For SetParameter, the field is nIndex ignored. If the format is supported,
it is set as the format of the port.
Change-Id: I5c1a9a87b56102c368ac0cd67475add02c3e9a1f
TreeHugger Robot [Wed, 7 Jun 2017 20:10:10 +0000 (20:10 +0000)]
Merge "fix: NCs in mediaextractor" into oc-dev
Wei Jia [Wed, 7 Jun 2017 18:24:17 +0000 (18:24 +0000)]
DO NOT MERGE -- NuPlayerDecoder: fail gracefully when input data can't be held in allocated buffer. am:
8818bf1fbb -s ours am:
b91cfc3589 am:
ed429f11e0 -s ours am:
7c86ed20b2 am:
bc7ecc89b6 am:
d687ad050e am:
b95bbe95b5 -s ours am:
92f7d06bb1 am:
f7f4d438cb am:
87db87b7bf am:
9088b5b8a9
am:
eb9f9b7d31 -s ours
Change-Id: I743d207631e1067459120a7e6e63995d5e2e7654
Wei Jia [Wed, 7 Jun 2017 18:22:13 +0000 (18:22 +0000)]
DO NOT MERGE -- NuPlayerDecoder: fail gracefully when input data can't be held in allocated buffer. am:
8818bf1fbb -s ours am:
b91cfc3589 am:
ed429f11e0 -s ours am:
7c86ed20b2 am:
bc7ecc89b6 am:
d687ad050e am:
b95bbe95b5 -s ours am:
92f7d06bb1 am:
f7f4d438cb am:
87db87b7bf
am:
9088b5b8a9
Change-Id: I870b2774f21cf227730d6a00b487750d5ba4055a
Wei Jia [Wed, 7 Jun 2017 18:20:43 +0000 (18:20 +0000)]
DO NOT MERGE -- NuPlayerDecoder: fail gracefully when input data can't be held in allocated buffer. am:
8818bf1fbb -s ours am:
b91cfc3589 am:
ed429f11e0 -s ours am:
7c86ed20b2 am:
bc7ecc89b6 am:
d687ad050e am:
b95bbe95b5 -s ours am:
92f7d06bb1 am:
f7f4d438cb
am:
87db87b7bf
Change-Id: I8440941258776b66f8405b6150875743f90dc36d
Wei Jia [Wed, 7 Jun 2017 18:18:44 +0000 (18:18 +0000)]
DO NOT MERGE -- NuPlayerDecoder: fail gracefully when input data can't be held in allocated buffer. am:
8818bf1fbb -s ours am:
b91cfc3589 am:
ed429f11e0 -s ours am:
7c86ed20b2 am:
bc7ecc89b6 am:
d687ad050e am:
b95bbe95b5 -s ours am:
92f7d06bb1
am:
f7f4d438cb
Change-Id: Ifcdfe3ef74d376b31ed323c005db06182eda043c
Wei Jia [Wed, 7 Jun 2017 18:16:42 +0000 (18:16 +0000)]
DO NOT MERGE -- NuPlayerDecoder: fail gracefully when input data can't be held in allocated buffer. am:
8818bf1fbb -s ours am:
b91cfc3589 am:
ed429f11e0 -s ours am:
7c86ed20b2 am:
bc7ecc89b6 am:
d687ad050e am:
b95bbe95b5 -s ours
am:
92f7d06bb1
Change-Id: I53de1bea488aae856123f2a5b8bc231b67a8cfcf
Wei Jia [Wed, 7 Jun 2017 18:13:36 +0000 (18:13 +0000)]
DO NOT MERGE -- NuPlayerDecoder: fail gracefully when input data can't be held in allocated buffer. am:
8818bf1fbb -s ours am:
b91cfc3589 am:
ed429f11e0 -s ours am:
7c86ed20b2 am:
bc7ecc89b6 am:
d687ad050e
am:
b95bbe95b5 -s ours
Change-Id: I72cbcb93e255b161e03107d75539987c9df4e4d4
Wei Jia [Wed, 7 Jun 2017 18:11:11 +0000 (18:11 +0000)]
DO NOT MERGE -- NuPlayerDecoder: fail gracefully when input data can't be held in allocated buffer. am:
8818bf1fbb -s ours am:
b91cfc3589 am:
ed429f11e0 -s ours am:
7c86ed20b2 am:
bc7ecc89b6
am:
d687ad050e
Change-Id: If7b8a7fb1c1bc986b2bb3909378e5540a9431a60
Wei Jia [Wed, 7 Jun 2017 18:09:12 +0000 (18:09 +0000)]
DO NOT MERGE -- NuPlayerDecoder: fail gracefully when input data can't be held in allocated buffer. am:
8818bf1fbb -s ours am:
b91cfc3589 am:
ed429f11e0 -s ours am:
7c86ed20b2
am:
bc7ecc89b6
Change-Id: I649fcc18615bca5d29a95da1ec1d2dcca75c2774
Wei Jia [Wed, 7 Jun 2017 18:06:10 +0000 (18:06 +0000)]
DO NOT MERGE -- NuPlayerDecoder: fail gracefully when input data can't be held in allocated buffer. am:
8818bf1fbb -s ours am:
b91cfc3589 am:
ed429f11e0 -s ours
am:
7c86ed20b2
Change-Id: I8fc5b501fdc8efb1ee0417c0c5eb572e3fcea75d
Wei Jia [Wed, 7 Jun 2017 18:01:33 +0000 (18:01 +0000)]
DO NOT MERGE -- NuPlayerDecoder: fail gracefully when input data can't be held in allocated buffer. am:
8818bf1fbb -s ours am:
b91cfc3589
am:
ed429f11e0 -s ours
Change-Id: Iae4fac75f4798261dcd1d6e5f1fabe223a38efc1
Wei Jia [Wed, 7 Jun 2017 17:57:32 +0000 (17:57 +0000)]
DO NOT MERGE -- NuPlayerDecoder: fail gracefully when input data can't be held in allocated buffer. am:
8818bf1fbb -s ours
am:
b91cfc3589
Change-Id: I3c1f4067a7c0d505790fe0232a362bd8220762af
Wei Jia [Wed, 7 Jun 2017 17:54:02 +0000 (17:54 +0000)]
DO NOT MERGE -- NuPlayerDecoder: fail gracefully when input data can't be held in allocated buffer.
am:
8818bf1fbb -s ours
Change-Id: If42ca4975b0069a972e980524cbe2e7c9f0bad6f
Wei Jia [Fri, 8 Jan 2016 00:03:03 +0000 (16:03 -0800)]
DO NOT MERGE -- NuPlayerDecoder: fail gracefully when input data can't be held in allocated buffer.
Bug:
38391487
Bug:
24145279
Change-Id: I6b99ee2dc63063557f4ee2c5856f7c848e969752
(cherry picked from commit
56097a8ecc31ec308a1caa38f92b69f99324eada)
Quddus Chong [Tue, 6 Jun 2017 18:14:04 +0000 (11:14 -0700)]
docs: Fix groupname for Media API ref docs.
Test: Verified by manually generating docs.
Change-Id: Ia7572db531a9ce28b75f16cd5de115d31d255245
Ricardo Garcia [Wed, 7 Jun 2017 14:02:46 +0000 (14:02 +0000)]
Merge "Fix security vulnerability: Equalizer setParameter memory overflow" into klp-dev am:
ef3a4aead0 am:
0ef6d9c121 am:
966e572c69 am:
1f7d80772c am:
a7e658fcca am:
6d2092f734 am:
6447404db3 am:
8693c57563 am:
25e3a40344 am:
51789f19de am:
7ba7584303 am:
5304cbcee8 am:
798dba38c4 am:
fdd5f801f5
am:
cdc2e0a0d8
Change-Id: I9bcbd28defbddbc323f86cdb4e3f0d57c6518625
Ricardo Garcia [Wed, 7 Jun 2017 14:00:42 +0000 (14:00 +0000)]
Merge "Fix security vulnerability: Equalizer setParameter memory overflow" into klp-dev am:
ef3a4aead0 am:
0ef6d9c121 am:
966e572c69 am:
1f7d80772c am:
a7e658fcca am:
6d2092f734 am:
6447404db3 am:
8693c57563 am:
25e3a40344 am:
51789f19de am:
7ba7584303 am:
5304cbcee8 am:
798dba38c4
am:
fdd5f801f5
Change-Id: I3623e04bc3e9c47cbeef59db26bf9c0c4c9c0a6c
Ricardo Garcia [Wed, 7 Jun 2017 13:57:45 +0000 (13:57 +0000)]
Merge "Fix security vulnerability: Equalizer setParameter memory overflow" into klp-dev am:
ef3a4aead0 am:
0ef6d9c121 am:
966e572c69 am:
1f7d80772c am:
a7e658fcca am:
6d2092f734 am:
6447404db3 am:
8693c57563 am:
25e3a40344 am:
51789f19de am:
7ba7584303 am:
5304cbcee8
am:
798dba38c4
Change-Id: Icbc515f881967cc1d484af3382713496d0f2fa36
Ricardo Garcia [Wed, 7 Jun 2017 13:55:16 +0000 (13:55 +0000)]
Merge "Fix security vulnerability: Equalizer setParameter memory overflow" into klp-dev am:
ef3a4aead0 am:
0ef6d9c121 am:
966e572c69 am:
1f7d80772c am:
a7e658fcca am:
6d2092f734 am:
6447404db3 am:
8693c57563 am:
25e3a40344 am:
51789f19de am:
7ba7584303
am:
5304cbcee8
Change-Id: Ia1b4a6a4b5f250c6c32c948f04e51dd7a0a2b393
Ricardo Garcia [Wed, 7 Jun 2017 13:52:47 +0000 (13:52 +0000)]
Merge "Fix security vulnerability: Equalizer setParameter memory overflow" into klp-dev am:
ef3a4aead0 am:
0ef6d9c121 am:
966e572c69 am:
1f7d80772c am:
a7e658fcca am:
6d2092f734 am:
6447404db3 am:
8693c57563 am:
25e3a40344 am:
51789f19de
am:
7ba7584303
Change-Id: I665d0aae8dfbab97a0bb97bf8a9bddc55ede3cff
Ricardo Garcia [Wed, 7 Jun 2017 13:49:47 +0000 (13:49 +0000)]
Merge "Fix security vulnerability: Equalizer setParameter memory overflow" into klp-dev am:
ef3a4aead0 am:
0ef6d9c121 am:
966e572c69 am:
1f7d80772c am:
a7e658fcca am:
6d2092f734 am:
6447404db3 am:
8693c57563 am:
25e3a40344
am:
51789f19de
Change-Id: Id2b44ecf0ce68d609f2a1270662a910a19f57a66
Ricardo Garcia [Wed, 7 Jun 2017 13:47:14 +0000 (13:47 +0000)]
Merge "Fix security vulnerability: Equalizer setParameter memory overflow" into klp-dev am:
ef3a4aead0 am:
0ef6d9c121 am:
966e572c69 am:
1f7d80772c am:
a7e658fcca am:
6d2092f734 am:
6447404db3 am:
8693c57563
am:
25e3a40344
Change-Id: I3d1c813830c1a6abd834b08273b25415bed55d9b
Ricardo Garcia [Wed, 7 Jun 2017 13:44:14 +0000 (13:44 +0000)]
Merge "Fix security vulnerability: Equalizer setParameter memory overflow" into klp-dev am:
ef3a4aead0 am:
0ef6d9c121 am:
966e572c69 am:
1f7d80772c am:
a7e658fcca am:
6d2092f734 am:
6447404db3
am:
8693c57563
Change-Id: I47e42971d14e7810a1af829826758bb684abce13
Ricardo Garcia [Wed, 7 Jun 2017 13:41:14 +0000 (13:41 +0000)]
Merge "Fix security vulnerability: Equalizer setParameter memory overflow" into klp-dev am:
ef3a4aead0 am:
0ef6d9c121 am:
966e572c69 am:
1f7d80772c am:
a7e658fcca am:
6d2092f734
am:
6447404db3
Change-Id: Ia434e713d3571890388e3560fef74c5f6594bed5
Ricardo Garcia [Wed, 7 Jun 2017 13:38:44 +0000 (13:38 +0000)]
Merge "Fix security vulnerability: Equalizer setParameter memory overflow" into klp-dev am:
ef3a4aead0 am:
0ef6d9c121 am:
966e572c69 am:
1f7d80772c am:
a7e658fcca
am:
6d2092f734
Change-Id: Ic8ace5d6ed81df5d8298d9031e635501ecf2b590
Ricardo Garcia [Wed, 7 Jun 2017 13:35:43 +0000 (13:35 +0000)]
Merge "Fix security vulnerability: Equalizer setParameter memory overflow" into klp-dev am:
ef3a4aead0 am:
0ef6d9c121 am:
966e572c69 am:
1f7d80772c
am:
a7e658fcca
Change-Id: I4070499668b42017c46e2556246fc973f7e638a4
Ricardo Garcia [Wed, 7 Jun 2017 13:32:43 +0000 (13:32 +0000)]
Merge "Fix security vulnerability: Equalizer setParameter memory overflow" into klp-dev am:
ef3a4aead0 am:
0ef6d9c121 am:
966e572c69
am:
1f7d80772c
Change-Id: I7a978b70b1330b619ac0ed46f3c191912ce0ffd1
Ricardo Garcia [Wed, 7 Jun 2017 13:30:13 +0000 (13:30 +0000)]
Merge "Fix security vulnerability: Equalizer setParameter memory overflow" into klp-dev am:
ef3a4aead0 am:
0ef6d9c121
am:
966e572c69
Change-Id: Ida849f8cad82a997a108ad472b150c7be29baf42
Ricardo Garcia [Wed, 7 Jun 2017 13:27:12 +0000 (13:27 +0000)]
Merge "Fix security vulnerability: Equalizer setParameter memory overflow" into klp-dev am:
ef3a4aead0
am:
0ef6d9c121
Change-Id: I420ab9888c2b542ca66fbb65fd2bf7ea7ff3bb16
Ricardo Garcia [Wed, 7 Jun 2017 13:24:12 +0000 (13:24 +0000)]
Merge "Fix security vulnerability: Equalizer setParameter memory overflow" into klp-dev
am:
ef3a4aead0
Change-Id: I31e26961aaf4ca49c8c4bfa3c4dccd03bab63286
Ricardo Garcia [Wed, 7 Jun 2017 13:19:48 +0000 (13:19 +0000)]
Merge "Fix security vulnerability: Equalizer setParameter memory overflow" into klp-dev
Jiyong Park [Tue, 6 Jun 2017 12:39:48 +0000 (21:39 +0900)]
fix: NCs in mediaextractor
Bug:
62255959
Test: adb shell monkey -p com.google.android.deskclock -p
com.android.calculator2 -p com.google.android.contacts -p
com.android.launcher -p com.google.android.launcher -p com.android.mms
-p com.google.android.apps.messaging -p com.android.phone -p
com.google.android.dialer -p com.android.providers.downloads.ui -p
com.android.settings -p com.google.android.calendar -p
com.google.android.GoogleCamera -p com.google.android.apps.photos -p
com.google.android.gms -p com.google.android.setupwizard -p
com.google.android.googlequicksearchbox -p
com.google.android.packageinstaller -p
com.google.android.apps.nexuslauncher -c
android.intent.category.LAUNCHER --ignore-security-exceptions
--monitor-native-crashes -s 490 -v -v -v 125000
Change-Id: If0aab0bca3237d1140dd8153ec614479c3c0ba2e
Pawin Vongmasa [Wed, 7 Jun 2017 05:32:11 +0000 (05:32 +0000)]
Merge "Check the buffer index from acquireBuffer" into klp-dev am:
d050902155 am:
668b7f4b8f am:
54f81e8fe7 am:
8cb7994cbf am:
fa0b15cf8f am:
d158da44d5 -s ours am:
eb7c508001 -s ours am:
8342e031ba -s ours am:
26151c1ac2 -s ours am:
e4f5cdce47 -s ours am:
8b6cd3c1c6 -s ours am:
f105e6ad23 -s ours am:
57c05dd9fb -s ours am:
5e128aa3d3 -s ours
am:
cf3434f441 -s ours
Change-Id: I2a8418f5c9d823f916f78eb5540b06f4b8c41912
Pawin Vongmasa [Wed, 7 Jun 2017 05:29:11 +0000 (05:29 +0000)]
Merge "Check the buffer index from acquireBuffer" into klp-dev am:
d050902155 am:
668b7f4b8f am:
54f81e8fe7 am:
8cb7994cbf am:
fa0b15cf8f am:
d158da44d5 -s ours am:
eb7c508001 -s ours am:
8342e031ba -s ours am:
26151c1ac2 -s ours am:
e4f5cdce47 -s ours am:
8b6cd3c1c6 -s ours am:
f105e6ad23 -s ours am:
57c05dd9fb -s ours
am:
5e128aa3d3 -s ours
Change-Id: I98db5869b2e5aa9db0d5ba2c473f2018d27d63d8
Pawin Vongmasa [Wed, 7 Jun 2017 05:26:41 +0000 (05:26 +0000)]
Merge "Check the buffer index from acquireBuffer" into klp-dev am:
d050902155 am:
668b7f4b8f am:
54f81e8fe7 am:
8cb7994cbf am:
fa0b15cf8f am:
d158da44d5 -s ours am:
eb7c508001 -s ours am:
8342e031ba -s ours am:
26151c1ac2 -s ours am:
e4f5cdce47 -s ours am:
8b6cd3c1c6 -s ours am:
f105e6ad23 -s ours
am:
57c05dd9fb -s ours
Change-Id: Ie2947f09ee8e61a6e1c7bc86bb6e36fc38a7bde1
Pawin Vongmasa [Wed, 7 Jun 2017 05:24:11 +0000 (05:24 +0000)]
Merge "Check the buffer index from acquireBuffer" into klp-dev am:
d050902155 am:
668b7f4b8f am:
54f81e8fe7 am:
8cb7994cbf am:
fa0b15cf8f am:
d158da44d5 -s ours am:
eb7c508001 -s ours am:
8342e031ba -s ours am:
26151c1ac2 -s ours am:
e4f5cdce47 -s ours am:
8b6cd3c1c6 -s ours
am:
f105e6ad23 -s ours
Change-Id: I71bca654ca12ff67a2854dd081affbce39e6c7c5
Pawin Vongmasa [Wed, 7 Jun 2017 05:21:39 +0000 (05:21 +0000)]
Merge "Check the buffer index from acquireBuffer" into klp-dev am:
d050902155 am:
668b7f4b8f am:
54f81e8fe7 am:
8cb7994cbf am:
fa0b15cf8f am:
d158da44d5 -s ours am:
eb7c508001 -s ours am:
8342e031ba -s ours am:
26151c1ac2 -s ours am:
e4f5cdce47 -s ours
am:
8b6cd3c1c6 -s ours
Change-Id: I159e1a355224ce73dd37ed956b3d181792f02873
Pawin Vongmasa [Wed, 7 Jun 2017 05:19:10 +0000 (05:19 +0000)]
Merge "Check the buffer index from acquireBuffer" into klp-dev am:
d050902155 am:
668b7f4b8f am:
54f81e8fe7 am:
8cb7994cbf am:
fa0b15cf8f am:
d158da44d5 -s ours am:
eb7c508001 -s ours am:
8342e031ba -s ours am:
26151c1ac2 -s ours
am:
e4f5cdce47 -s ours
Change-Id: Iddbea1d12cecd6fabcb14410f89d3e2ac20cfc43
Pawin Vongmasa [Wed, 7 Jun 2017 05:16:39 +0000 (05:16 +0000)]
Merge "Check the buffer index from acquireBuffer" into klp-dev am:
d050902155 am:
668b7f4b8f am:
54f81e8fe7 am:
8cb7994cbf am:
fa0b15cf8f am:
d158da44d5 -s ours am:
eb7c508001 -s ours am:
8342e031ba -s ours
am:
26151c1ac2 -s ours
Change-Id: I4824b21c74a63ef8737566683120fa8f7d868058
Pawin Vongmasa [Wed, 7 Jun 2017 05:14:08 +0000 (05:14 +0000)]
Merge "Check the buffer index from acquireBuffer" into klp-dev am:
d050902155 am:
668b7f4b8f am:
54f81e8fe7 am:
8cb7994cbf am:
fa0b15cf8f am:
d158da44d5 -s ours am:
eb7c508001 -s ours
am:
8342e031ba -s ours
Change-Id: I1c17a2dfff3ce6986db59eb33efadbcb37c164ab
Pawin Vongmasa [Wed, 7 Jun 2017 05:11:39 +0000 (05:11 +0000)]
Merge "Check the buffer index from acquireBuffer" into klp-dev am:
d050902155 am:
668b7f4b8f am:
54f81e8fe7 am:
8cb7994cbf am:
fa0b15cf8f am:
d158da44d5 -s ours
am:
eb7c508001 -s ours
Change-Id: I42bfc18d2ee72c2c0e423404521b35c125a8fe19
Pawin Vongmasa [Wed, 7 Jun 2017 05:09:08 +0000 (05:09 +0000)]
Merge "Check the buffer index from acquireBuffer" into klp-dev am:
d050902155 am:
668b7f4b8f am:
54f81e8fe7 am:
8cb7994cbf am:
fa0b15cf8f
am:
d158da44d5 -s ours
Change-Id: Id6a31d4db40a4ce7a51a0b3832b821406f112d02
Pawin Vongmasa [Wed, 7 Jun 2017 05:06:39 +0000 (05:06 +0000)]
Merge "Check the buffer index from acquireBuffer" into klp-dev am:
d050902155 am:
668b7f4b8f am:
54f81e8fe7 am:
8cb7994cbf
am:
fa0b15cf8f
Change-Id: I13e12ece1adb4babeea580a53a094a305e3819f3
Pawin Vongmasa [Wed, 7 Jun 2017 05:04:08 +0000 (05:04 +0000)]
Merge "Check the buffer index from acquireBuffer" into klp-dev am:
d050902155 am:
668b7f4b8f am:
54f81e8fe7
am:
8cb7994cbf
Change-Id: Ibf23434ea242faa85098c73747d1dc42ad5c85ba
Pawin Vongmasa [Wed, 7 Jun 2017 05:01:37 +0000 (05:01 +0000)]
Merge "Check the buffer index from acquireBuffer" into klp-dev am:
d050902155 am:
668b7f4b8f
am:
54f81e8fe7
Change-Id: Ic1ee69858d27b8d695f075bd436faa04795f058f
Pawin Vongmasa [Wed, 7 Jun 2017 04:59:38 +0000 (04:59 +0000)]
Merge "Check the buffer index from acquireBuffer" into klp-dev am:
d050902155
am:
668b7f4b8f
Change-Id: I9d59a91f2a63115978bc48087a721cd7e6d8facb
Pawin Vongmasa [Wed, 7 Jun 2017 04:56:39 +0000 (04:56 +0000)]
Merge "Check the buffer index from acquireBuffer" into klp-dev
am:
d050902155
Change-Id: I45700eef5e0a9eec1bcfdc4d810f20d2a5668531
TreeHugger Robot [Wed, 7 Jun 2017 04:51:35 +0000 (04:51 +0000)]
Merge "Check the buffer index from acquireBuffer" into klp-dev
Pawin Vongmasa [Wed, 7 Jun 2017 02:31:01 +0000 (02:31 +0000)]
Merge "Check the buffer index from acquireBuffer" into mnc-dev am:
ec2549aa62 am:
adfbbe1684 am:
11b3066c06 am:
5f0883c02a -s ours am:
68d565932f -s ours am:
e38b2ed078 -s ours am:
ead6ac4da1 -s ours am:
1d7447ecb7 -s ours
am:
c434840227 -s ours
Change-Id: Idc873d3772543754f433f4b9e48403d80f71854e
Pawin Vongmasa [Wed, 7 Jun 2017 02:27:56 +0000 (02:27 +0000)]
Merge "Check the buffer index from acquireBuffer" into mnc-dev am:
ec2549aa62 am:
adfbbe1684 am:
11b3066c06 am:
5f0883c02a -s ours am:
68d565932f -s ours am:
e38b2ed078 -s ours am:
ead6ac4da1 -s ours
am:
1d7447ecb7 -s ours
Change-Id: I304c4b62d47ba709e491fba9b6cf5833d8501162
Pawin Vongmasa [Wed, 7 Jun 2017 02:25:55 +0000 (02:25 +0000)]
Merge "Check the buffer index from acquireBuffer" into mnc-dev am:
ec2549aa62 am:
adfbbe1684 am:
11b3066c06 am:
5f0883c02a -s ours am:
68d565932f -s ours am:
e38b2ed078 -s ours
am:
ead6ac4da1 -s ours
Change-Id: I9ffbe970e87cf5728334efb5bbf220b630a7c013
Pawin Vongmasa [Wed, 7 Jun 2017 02:23:24 +0000 (02:23 +0000)]
Merge "Check the buffer index from acquireBuffer" into mnc-dev am:
ec2549aa62 am:
adfbbe1684 am:
11b3066c06 am:
5f0883c02a -s ours am:
68d565932f -s ours
am:
e38b2ed078 -s ours
Change-Id: I313dd576ed1d35be2b08913e84c0b3c92a869e54
Pawin Vongmasa [Wed, 7 Jun 2017 02:20:53 +0000 (02:20 +0000)]
Merge "Check the buffer index from acquireBuffer" into mnc-dev am:
ec2549aa62 am:
adfbbe1684 am:
11b3066c06 am:
5f0883c02a -s ours
am:
68d565932f -s ours
Change-Id: Ibabad366b172d42551eb50afb5e1e595679c50a6
Pawin Vongmasa [Wed, 7 Jun 2017 02:18:23 +0000 (02:18 +0000)]
Merge "Check the buffer index from acquireBuffer" into mnc-dev am:
ec2549aa62 am:
adfbbe1684 am:
11b3066c06
am:
5f0883c02a -s ours
Change-Id: I8f884d17ccd8c58a86d389633be80da08cd0e8d7
Pawin Vongmasa [Wed, 7 Jun 2017 02:15:55 +0000 (02:15 +0000)]
Merge "Check the buffer index from acquireBuffer" into mnc-dev am:
ec2549aa62 am:
adfbbe1684
am:
11b3066c06
Change-Id: I53089abb23af74febf92aa8c70ca807cb3213a63
Pawin Vongmasa [Wed, 7 Jun 2017 02:13:23 +0000 (02:13 +0000)]
Merge "Check the buffer index from acquireBuffer" into mnc-dev am:
ec2549aa62
am:
adfbbe1684
Change-Id: I2c5cb01a4d8fbeaed1dbadc5cb1ab3b4a0f7d60e
Pawin Vongmasa [Wed, 7 Jun 2017 02:11:25 +0000 (02:11 +0000)]
Merge "Check the buffer index from acquireBuffer" into mnc-dev
am:
ec2549aa62
Change-Id: Ifa4eeaf32cd5a7d5ab77c0e20d3ab5d5b811def5
TreeHugger Robot [Wed, 7 Jun 2017 02:05:17 +0000 (02:05 +0000)]
Merge "Check the buffer index from acquireBuffer" into mnc-dev
Pawin Vongmasa [Wed, 7 Jun 2017 01:18:14 +0000 (01:18 +0000)]
Merge "Check the buffer index from acquireBuffer" into nyc-dev am:
c12291d88a am:
2c0e01a4f0 -s ours am:
05bfca63f4 -s ours am:
33971b3c84 -s ours
am:
943ed32642 -s ours
Change-Id: Id75563fde57d06ac964cf82b161b342e1c8d97f4
Pawin Vongmasa [Wed, 7 Jun 2017 01:15:17 +0000 (01:15 +0000)]
Merge "Check the buffer index from acquireBuffer" into nyc-dev am:
c12291d88a am:
2c0e01a4f0 -s ours am:
05bfca63f4 -s ours
am:
33971b3c84 -s ours
Change-Id: I138ee27ab75e8055f0ca7a081a45cad0f3a4ed9d
Pawin Vongmasa [Wed, 7 Jun 2017 01:13:48 +0000 (01:13 +0000)]
Merge "Check the buffer index from acquireBuffer" into nyc-dev am:
c12291d88a am:
2c0e01a4f0 -s ours
am:
05bfca63f4 -s ours
Change-Id: I9c33dec885f7ba742d26f95d2b9fbff9984ba2ad
Pawin Vongmasa [Wed, 7 Jun 2017 01:11:16 +0000 (01:11 +0000)]
Merge "Check the buffer index from acquireBuffer" into nyc-dev am:
c12291d88a
am:
2c0e01a4f0 -s ours
Change-Id: I4bff134b14e7fd989eebfa2ac6fecffaf10cec02
Pawin Vongmasa [Wed, 7 Jun 2017 01:09:58 +0000 (01:09 +0000)]
Merge "Check the buffer index from acquireBuffer" into nyc-dev
am:
c12291d88a
Change-Id: I7b6cff8f5bb2cc4c79e02fde50c648276f6c052b
rago [Mon, 5 Jun 2017 19:15:05 +0000 (12:15 -0700)]
Fix security vulnerability: Equalizer setParameter memory overflow
Bug:
37563371
Test: use POC on bug or cts security test
Change-Id: I9c9453a222b53fd5ef821330a34cb9e938e4d9c5
TreeHugger Robot [Wed, 7 Jun 2017 01:04:43 +0000 (01:04 +0000)]
Merge "Check the buffer index from acquireBuffer" into nyc-dev
TreeHugger Robot [Wed, 7 Jun 2017 00:44:37 +0000 (00:44 +0000)]
Merge "Protect sp assignments in RemoteDataSource." into oc-dev
Pawin Vongmasa [Tue, 6 Jun 2017 23:31:35 +0000 (23:31 +0000)]
Merge "RESTRICT AUTOMERGE Check the buffer index from acquireBuffer" into nyc-mr1-dev am:
c422235e9b am:
f13d78e7e8
am:
94c024db21 -s ours
Change-Id: I5c025acf56f90864f575ceb6c75487a22dd5a1a1
Pawin Vongmasa [Tue, 6 Jun 2017 23:29:29 +0000 (23:29 +0000)]
Merge "RESTRICT AUTOMERGE Check the buffer index from acquireBuffer" into nyc-mr1-dev am:
c422235e9b
am:
f13d78e7e8
Change-Id: I400e3759e5066b67f57e5b75801391890548239e
Pawin Vongmasa [Tue, 6 Jun 2017 23:27:37 +0000 (23:27 +0000)]
Merge "RESTRICT AUTOMERGE Check the buffer index from acquireBuffer" into nyc-mr1-dev
am:
c422235e9b
Change-Id: Ic85b05aeff78a1260efe4ee34006580ea51c9c63
TreeHugger Robot [Tue, 6 Jun 2017 23:21:24 +0000 (23:21 +0000)]
Merge "RESTRICT AUTOMERGE Check the buffer index from acquireBuffer" into nyc-mr1-dev
Andy Hung [Tue, 6 Jun 2017 21:42:09 +0000 (21:42 +0000)]
Merge "EffectBundle: Check value size for get preset name" into klp-dev am:
f5d6e98996 am:
b401a3bf44 am:
1f44782e92 am:
ea83248dfb am:
716d258db4 am:
f043bb5da6 am:
4d76e5bcd6 am:
f21d5b4580 am:
f0221a7dbe am:
b26594e6ae am:
158ec15776 am:
426244d6dc am:
c47adacb0d am:
0d340d4990
am:
0d77973e73
Change-Id: Id64c4d474e17a866d1981de43c6d22476f29da29
Andy Hung [Tue, 6 Jun 2017 21:36:36 +0000 (21:36 +0000)]
Merge "EffectBundle: Check value size for get preset name" into klp-dev am:
f5d6e98996 am:
b401a3bf44 am:
1f44782e92 am:
ea83248dfb am:
716d258db4 am:
f043bb5da6 am:
4d76e5bcd6 am:
f21d5b4580 am:
f0221a7dbe am:
b26594e6ae am:
158ec15776 am:
426244d6dc am:
c47adacb0d
am:
0d340d4990
Change-Id: I04c860d923c1d48295472f302ebf59376e21f35b
Andy Hung [Tue, 6 Jun 2017 21:31:09 +0000 (21:31 +0000)]
Merge "EffectBundle: Check value size for get preset name" into klp-dev am:
f5d6e98996 am:
b401a3bf44 am:
1f44782e92 am:
ea83248dfb am:
716d258db4 am:
f043bb5da6 am:
4d76e5bcd6 am:
f21d5b4580 am:
f0221a7dbe am:
b26594e6ae am:
158ec15776 am:
426244d6dc
am:
c47adacb0d
Change-Id: I1ef1fd980140139ecd9322fc15d9c6e2f8b85c84
Andy Hung [Tue, 6 Jun 2017 21:27:38 +0000 (21:27 +0000)]
Merge "EffectBundle: Check value size for get preset name" into klp-dev am:
f5d6e98996 am:
b401a3bf44 am:
1f44782e92 am:
ea83248dfb am:
716d258db4 am:
f043bb5da6 am:
4d76e5bcd6 am:
f21d5b4580 am:
f0221a7dbe am:
b26594e6ae am:
158ec15776
am:
426244d6dc
Change-Id: I384986ee486de0b5ac4bfdbba53c92e7dddfe0e8
Ray Essick [Tue, 6 Jun 2017 21:26:26 +0000 (21:26 +0000)]
Merge "better manage buffer for libstagefright_soft_mpeg4enc" into klp-dev am:
021575025c am:
5944b611e5 am:
1a419c7b2a am:
70a63bdf27 am:
40833da7b9 am:
2ad98cf1c7 am:
be560fcb1c am:
b9f302c2f0 am:
1c1d3116d9 am:
f7350dd989 am:
a06d2eb83e am:
ce15503bf9 am:
6ff81f0096 am:
feecaecca1
am:
fde4cbba53
Change-Id: Ie7271767369a4a12995ce92be3933731e2e51f69
Wei Jia [Tue, 6 Jun 2017 21:25:58 +0000 (21:25 +0000)]
Merge "m4v_h263: update width/height only when they are valid." into klp-dev am:
2da03f40eb am:
5e9a9442a3 am:
36eb1039cf am:
1173c884db am:
3e99d14712 am:
0cb6c1f2b3 am:
a0f88fe10b am:
3905eac9c0 am:
1c724844d8 am:
ab6bb51371 am:
367499bc42 am:
a087c3fc93 am:
b8eb299886 am:
d206fc5664
am:
6d8f3b8240
Change-Id: I6a512b3112c52cd44ae37b33216add76da540f73
Ray Essick [Tue, 6 Jun 2017 21:20:39 +0000 (21:20 +0000)]
Merge "better manage buffer for libstagefright_soft_mpeg4enc" into klp-dev am:
021575025c am:
5944b611e5 am:
1a419c7b2a am:
70a63bdf27 am:
40833da7b9 am:
2ad98cf1c7 am:
be560fcb1c am:
b9f302c2f0 am:
1c1d3116d9 am:
f7350dd989 am:
a06d2eb83e am:
ce15503bf9 am:
6ff81f0096
am:
feecaecca1
Change-Id: I4685f12d40a5a2afc46f54fa26308961866c5239
Wei Jia [Tue, 6 Jun 2017 21:20:12 +0000 (21:20 +0000)]
Merge "m4v_h263: update width/height only when they are valid." into klp-dev am:
2da03f40eb am:
5e9a9442a3 am:
36eb1039cf am:
1173c884db am:
3e99d14712 am:
0cb6c1f2b3 am:
a0f88fe10b am:
3905eac9c0 am:
1c724844d8 am:
ab6bb51371 am:
367499bc42 am:
a087c3fc93 am:
b8eb299886
am:
d206fc5664
Change-Id: If5e76c48ee3cabd10f41bc4dbe5ec5198f8324ba
Andy Hung [Tue, 6 Jun 2017 21:19:55 +0000 (21:19 +0000)]
Merge "EffectBundle: Check value size for get preset name" into klp-dev am:
f5d6e98996 am:
b401a3bf44 am:
1f44782e92 am:
ea83248dfb am:
716d258db4 am:
f043bb5da6 am:
4d76e5bcd6 am:
f21d5b4580 am:
f0221a7dbe am:
b26594e6ae
am:
158ec15776
Change-Id: I8f95b5d6e62dfef4edfd991b56c51e056081f452
Ray Essick [Tue, 6 Jun 2017 21:16:18 +0000 (21:16 +0000)]
Merge "better manage buffer for libstagefright_soft_mpeg4enc" into klp-dev am:
021575025c am:
5944b611e5 am:
1a419c7b2a am:
70a63bdf27 am:
40833da7b9 am:
2ad98cf1c7 am:
be560fcb1c am:
b9f302c2f0 am:
1c1d3116d9 am:
f7350dd989 am:
a06d2eb83e am:
ce15503bf9
am:
6ff81f0096
Change-Id: Ib118a262039d8828bffd9184cba3246a54b62bca
Wei Jia [Tue, 6 Jun 2017 21:15:54 +0000 (21:15 +0000)]
Merge "m4v_h263: update width/height only when they are valid." into klp-dev am:
2da03f40eb am:
5e9a9442a3 am:
36eb1039cf am:
1173c884db am:
3e99d14712 am:
0cb6c1f2b3 am:
a0f88fe10b am:
3905eac9c0 am:
1c724844d8 am:
ab6bb51371 am:
367499bc42 am:
a087c3fc93
am:
b8eb299886
Change-Id: I0d7576dfbe4c6c0a9b914b00508b81efac1d439c
Andy Hung [Tue, 6 Jun 2017 21:15:26 +0000 (21:15 +0000)]
Merge "EffectBundle: Check value size for get preset name" into klp-dev am:
f5d6e98996 am:
b401a3bf44 am:
1f44782e92 am:
ea83248dfb am:
716d258db4 am:
f043bb5da6 am:
4d76e5bcd6 am:
f21d5b4580 am:
f0221a7dbe
am:
b26594e6ae
Change-Id: I4e3f2f389f80c4dd3f8775ce265f2059ff637f0d
Ray Essick [Tue, 6 Jun 2017 21:12:20 +0000 (21:12 +0000)]
Merge "better manage buffer for libstagefright_soft_mpeg4enc" into klp-dev am:
021575025c am:
5944b611e5 am:
1a419c7b2a am:
70a63bdf27 am:
40833da7b9 am:
2ad98cf1c7 am:
be560fcb1c am:
b9f302c2f0 am:
1c1d3116d9 am:
f7350dd989 am:
a06d2eb83e
am:
ce15503bf9
Change-Id: I7ebfe4251b74d1268624fdad16c13b2c329d2ddf
Wei Jia [Tue, 6 Jun 2017 21:11:54 +0000 (21:11 +0000)]
Merge "m4v_h263: update width/height only when they are valid." into klp-dev am:
2da03f40eb am:
5e9a9442a3 am:
36eb1039cf am:
1173c884db am:
3e99d14712 am:
0cb6c1f2b3 am:
a0f88fe10b am:
3905eac9c0 am:
1c724844d8 am:
ab6bb51371 am:
367499bc42
am:
a087c3fc93
Change-Id: I870b467ebfb350508872c8115ebe04f48650c73b
Andy Hung [Tue, 6 Jun 2017 21:09:53 +0000 (21:09 +0000)]
Merge "EffectBundle: Check value size for get preset name" into klp-dev am:
f5d6e98996 am:
b401a3bf44 am:
1f44782e92 am:
ea83248dfb am:
716d258db4 am:
f043bb5da6 am:
4d76e5bcd6 am:
f21d5b4580
am:
f0221a7dbe
Change-Id: I15e7d315c71147e7798e8c81737000a3d0706f2d
Ray Essick [Tue, 6 Jun 2017 21:08:19 +0000 (21:08 +0000)]
Merge "better manage buffer for libstagefright_soft_mpeg4enc" into klp-dev am:
021575025c am:
5944b611e5 am:
1a419c7b2a am:
70a63bdf27 am:
40833da7b9 am:
2ad98cf1c7 am:
be560fcb1c am:
b9f302c2f0 am:
1c1d3116d9 am:
f7350dd989
am:
a06d2eb83e
Change-Id: I67cbeed83d25ff5aa228f6f418656a3d984daf09
Wei Jia [Tue, 6 Jun 2017 21:07:55 +0000 (21:07 +0000)]
Merge "m4v_h263: update width/height only when they are valid." into klp-dev am:
2da03f40eb am:
5e9a9442a3 am:
36eb1039cf am:
1173c884db am:
3e99d14712 am:
0cb6c1f2b3 am:
a0f88fe10b am:
3905eac9c0 am:
1c724844d8 am:
ab6bb51371
am:
367499bc42
Change-Id: Ib79ce8adddb4012b3d5051550811a73d140cacd9
Andy Hung [Tue, 6 Jun 2017 21:07:54 +0000 (21:07 +0000)]
Merge "EffectBundle: Check value size for get preset name" into klp-dev am:
f5d6e98996 am:
b401a3bf44 am:
1f44782e92 am:
ea83248dfb am:
716d258db4 am:
f043bb5da6 am:
4d76e5bcd6
am:
f21d5b4580
Change-Id: Ic809905d53a2443bc868894a029fd4625f006e87
Wei Jia [Tue, 6 Jun 2017 21:07:04 +0000 (21:07 +0000)]
Merge "m4v_h263: check header first before decoding a frame." into lmp-dev am:
6aed93d593 am:
8772f84f2c am:
fc97c43c79 am:
c572616245 am:
0c2592782f am:
a4a232c7d4 am:
d8de34f60c am:
8bd081a57f am:
b73a717745 am:
53ee1b675b am:
6c58251e3d
am:
ce85c6646e
Change-Id: I8e17f4ce9a2425fcaad4aa10a80c7587545be5d8
Andy Hung [Tue, 6 Jun 2017 21:06:26 +0000 (21:06 +0000)]
Merge "EffectBundle: Check value size for get preset name" into klp-dev am:
f5d6e98996 am:
b401a3bf44 am:
1f44782e92 am:
ea83248dfb am:
716d258db4 am:
f043bb5da6
am:
4d76e5bcd6
Change-Id: If11f64ffbed4b890772eb2be984bb65c877199e4
Andy Hung [Tue, 6 Jun 2017 21:04:22 +0000 (21:04 +0000)]
Merge "EffectBundle: Check value size for get preset name" into klp-dev am:
f5d6e98996 am:
b401a3bf44 am:
1f44782e92 am:
ea83248dfb am:
716d258db4
am:
f043bb5da6
Change-Id: I2a3a4486ade55675ce06ad9b6e3a4c01d1a4647d
Ray Essick [Tue, 6 Jun 2017 21:03:26 +0000 (21:03 +0000)]
Merge "better manage buffer for libstagefright_soft_mpeg4enc" into klp-dev am:
021575025c am:
5944b611e5 am:
1a419c7b2a am:
70a63bdf27 am:
40833da7b9 am:
2ad98cf1c7 am:
be560fcb1c am:
b9f302c2f0 am:
1c1d3116d9
am:
f7350dd989
Change-Id: I811d91df28a5eb49f72e0add5c58165066a50891
Wei Jia [Tue, 6 Jun 2017 21:02:54 +0000 (21:02 +0000)]
Merge "m4v_h263: update width/height only when they are valid." into klp-dev am:
2da03f40eb am:
5e9a9442a3 am:
36eb1039cf am:
1173c884db am:
3e99d14712 am:
0cb6c1f2b3 am:
a0f88fe10b am:
3905eac9c0 am:
1c724844d8
am:
ab6bb51371
Change-Id: Id7b3bf6e2a884982305b253d84c045287471c29a
Andy Hung [Tue, 6 Jun 2017 21:02:53 +0000 (21:02 +0000)]
Merge "EffectBundle: Check value size for get preset name" into klp-dev am:
f5d6e98996 am:
b401a3bf44 am:
1f44782e92 am:
ea83248dfb
am:
716d258db4
Change-Id: I30639642fdcb0f4724925f72533dcd17f6881714
Andy Hung [Tue, 6 Jun 2017 21:00:54 +0000 (21:00 +0000)]
Merge "EffectBundle: Check value size for get preset name" into klp-dev am:
f5d6e98996 am:
b401a3bf44 am:
1f44782e92
am:
ea83248dfb
Change-Id: I0ceea1282ab530f228b8e6f54678edf3bb2f9d69
Wei Jia [Tue, 6 Jun 2017 21:00:37 +0000 (21:00 +0000)]
Merge "m4v_h263: check header first before decoding a frame." into lmp-dev am:
6aed93d593 am:
8772f84f2c am:
fc97c43c79 am:
c572616245 am:
0c2592782f am:
a4a232c7d4 am:
d8de34f60c am:
8bd081a57f am:
b73a717745 am:
53ee1b675b
am:
6c58251e3d
Change-Id: Iac79c371f94fd58373ec0b7780386cc68522d1b9
OSDN Git Service
