OSDN Git Service
Android Build Merger (Role) [Wed, 16 Aug 2017 01:58:36 +0000 (01:58 +0000)]
[automerger] Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into klp-ub-dev am:
15f75d0422 am:
ce9a76f40c am:
0640937bdb am:
480084e6af am:
34b2a8b522
Change-Id: Iffd510d4e17d68a038c0755bbd42bd51b656e8fa
Android Build Merger (Role) [Wed, 16 Aug 2017 01:58:30 +0000 (01:58 +0000)]
[automerger] Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into klp-ub-dev am:
15f75d0422 am:
ce9a76f40c am:
0640937bdb am:
480084e6af
Change-Id: I33f6fdffdaa35fbd524c61a30348b90680ab9dae
Android Build Merger (Role) [Wed, 16 Aug 2017 01:58:23 +0000 (01:58 +0000)]
[automerger] Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into klp-ub-dev am:
15f75d0422 am:
ce9a76f40c am:
0640937bdb
Change-Id: Ifce752f0511ce8fc5d16f79f682063109b8bee37
Android Build Merger (Role) [Wed, 16 Aug 2017 01:58:18 +0000 (01:58 +0000)]
[automerger] Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into klp-ub-dev am:
15f75d0422 am:
ce9a76f40c
Change-Id: Ib1416049d9793045e08182d61c22cad65383ffd5
Dongwon Kang [Wed, 16 Aug 2017 01:57:43 +0000 (01:57 +0000)]
Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into klp-ub-dev
am:
15f75d0422
Change-Id: Id14d38f22f91c68682acdb3572c07a6e57780b03
Dongwon Kang [Wed, 16 Aug 2017 00:33:59 +0000 (00:33 +0000)]
Merge "Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into lmp-mr1-dev am:
4c01d8afde" into lmp-mr1-app-dev
am:
7321b13ddc
Change-Id: If2e53431ccd1bf4bc0bb720bf916b731a35fdaaf
Android Build Merger (Role) [Wed, 16 Aug 2017 00:17:19 +0000 (00:17 +0000)]
Merge "Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into lmp-mr1-dev am:
4c01d8afde" into lmp-mr1-app-dev
Android Build Merger (Role) [Wed, 16 Aug 2017 00:13:03 +0000 (00:13 +0000)]
[automerger] Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into lmp-mr1-dev am:
4c01d8afde am:
fafd25255e
Change-Id: Id2a32097ac7af664a6fdb3e6e69ccdb6df38e8b4
Dongwon Kang [Wed, 16 Aug 2017 00:12:17 +0000 (00:12 +0000)]
Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into lmp-mr1-dev
am:
4c01d8afde
Change-Id: I8c11f8cac81a8c9de0df8506f3bb3fa339422bb6
Android Build Merger (Role) [Wed, 16 Aug 2017 00:06:39 +0000 (00:06 +0000)]
[automerger] Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into klp-modular-dev am:
47da6c0b7e am:
bc09b59061 am:
ff9c5ad85f am:
31199e5d39
Change-Id: Ia07ed172e6fdaa560add83dc2bb8d2c4f50b3448
Android Build Merger (Role) [Wed, 16 Aug 2017 00:06:34 +0000 (00:06 +0000)]
[automerger] Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into klp-modular-dev am:
47da6c0b7e am:
bc09b59061 am:
ff9c5ad85f
Change-Id: I565376e4dda0297ba53ce7f4418d1b7fc685a600
Android Build Merger (Role) [Wed, 16 Aug 2017 00:06:29 +0000 (00:06 +0000)]
[automerger] Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into klp-modular-dev am:
47da6c0b7e am:
bc09b59061
Change-Id: I7e3fc6ae23f15b69860965678eaa788e3c75add1
Dongwon Kang [Wed, 16 Aug 2017 00:05:57 +0000 (00:05 +0000)]
Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into klp-modular-dev
am:
47da6c0b7e
Change-Id: Ic636c904d8dd4f7b329e2571f336aabf4f2a0079
Dongwon Kang [Tue, 15 Aug 2017 23:54:32 +0000 (23:54 +0000)]
Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into lmp-mr1-app-dev
am:
220213623b
Change-Id: I64dc27a3b6982c33ed8bb6f3c6b2801480447faa
TreeHugger Robot [Tue, 15 Aug 2017 23:44:25 +0000 (23:44 +0000)]
Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into klp-modular-dev
* changes:
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb
Check buffer size in useBuffer in software components
TreeHugger Robot [Tue, 15 Aug 2017 23:44:25 +0000 (23:44 +0000)]
Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into klp-ub-dev
* changes:
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb
Check buffer size in useBuffer in software components
TreeHugger Robot [Tue, 15 Aug 2017 23:44:25 +0000 (23:44 +0000)]
Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into lmp-mr1-app-dev
* changes:
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9 am:
33508aff52 am:
0de0b6806a am:
6d0c3ebd0f
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9 am:
33508aff52 am:
0de0b6806a
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9 am:
33508aff52
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb
Check buffer size in useBuffer in software components
TreeHugger Robot [Tue, 15 Aug 2017 23:44:25 +0000 (23:44 +0000)]
Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into lmp-mr1-dev
* changes:
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9 am:
33508aff52 am:
0de0b6806a
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9 am:
33508aff52
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb
Check buffer size in useBuffer in software components
TreeHugger Robot [Tue, 15 Aug 2017 23:44:25 +0000 (23:44 +0000)]
Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into lmp-dev
* changes:
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9 am:
33508aff52
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb
Check buffer size in useBuffer in software components
TreeHugger Robot [Tue, 15 Aug 2017 23:44:25 +0000 (23:44 +0000)]
Merge changes from topic "am-
7424efa6-0590-42df-bf56-
90682a2c4f31" into mnc-dev
* changes:
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9 am:
33508aff52 am:
0de0b6806a am:
6d0c3ebd0f am:
d411bde017
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9 am:
33508aff52 am:
0de0b6806a am:
6d0c3ebd0f
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9 am:
33508aff52 am:
0de0b6806a
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9 am:
33508aff52
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb
Check buffer size in useBuffer in software components
Lajos Molnar [Tue, 15 Aug 2017 22:21:33 +0000 (22:21 +0000)]
[automerger] Merge commit '
e42038e5c7286a15a50dd1decfa1a579dbda8cd6' into HEAD am:
1ec4196300 am:
dba49298e2 am:
b9348d12a8
Change-Id: Ic9a15317becdbb4acf1343ac064f4e2c77b2b114
Lajos Molnar [Tue, 15 Aug 2017 22:21:28 +0000 (22:21 +0000)]
[automerger] Merge commit '
e42038e5c7286a15a50dd1decfa1a579dbda8cd6' into HEAD am:
1ec4196300 am:
dba49298e2
Change-Id: I674a5e8e1587de842352deb41279b6ea32045b60
Lajos Molnar [Tue, 15 Aug 2017 22:21:23 +0000 (22:21 +0000)]
[automerger] Merge commit '
e42038e5c7286a15a50dd1decfa1a579dbda8cd6' into HEAD am:
1ec4196300
Change-Id: I16d35492c1254579794d4398dee28dd556a1703d
Lajos Molnar [Tue, 15 Aug 2017 22:10:32 +0000 (15:10 -0700)]
Merge commit '
e42038e5c7286a15a50dd1decfa1a579dbda8cd6' into HEAD
* commit '
e42038e5c7286a15a50dd1decfa1a579dbda8cd6':
stagefright: avoid buffer overflow in base64 decoder
Bug:
62673128
Change-Id: I2cfd6b4f7e30c111de54d9b42e7bc94a3a5aefba
Dongwon Kang [Tue, 15 Aug 2017 22:06:15 +0000 (22:06 +0000)]
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9 am:
33508aff52 am:
0de0b6806a am:
6d0c3ebd0f am:
d411bde017
Change-Id: Ic6c8672379bf0e84715d0da49ae4704ac0a2ea02
Dongwon Kang [Tue, 15 Aug 2017 22:06:10 +0000 (22:06 +0000)]
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9 am:
33508aff52 am:
0de0b6806a am:
6d0c3ebd0f
Change-Id: I6a29a7a6f8db29380f6adcc0d4ed6b4c3935c309
Dongwon Kang [Tue, 15 Aug 2017 22:06:05 +0000 (22:06 +0000)]
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9 am:
33508aff52 am:
0de0b6806a
Change-Id: Idf513ba06641aacf48f457b3a8ae02721404b7c1
Dongwon Kang [Tue, 15 Aug 2017 22:05:59 +0000 (22:05 +0000)]
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9 am:
33508aff52
Change-Id: Ic12354524144a6d1337be0a7c57efb4711cee660
Dongwon Kang [Tue, 15 Aug 2017 22:05:53 +0000 (22:05 +0000)]
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb am:
12840141a9
Change-Id: Ibbbdacd98e6362267e5f7b926a70c133a0a3d9f4
Dongwon Kang [Tue, 15 Aug 2017 22:05:47 +0000 (22:05 +0000)]
[automerger] Check buffer size in useBuffer in software components am:
4e79910fdb
Change-Id: I12e72631c86a3d1cb5fadb89243c1acacc7c20a7
Dongwon Kang [Mon, 24 Jul 2017 20:59:51 +0000 (13:59 -0700)]
Check buffer size in useBuffer in software components
Test: No more crash from oob read/write with running poc.
Bug:
63522430
Change-Id: I232d256eacdfaa9347902fe9b42650999f0d2d85
Lajos Molnar [Tue, 15 Aug 2017 22:02:19 +0000 (22:02 +0000)]
[automerger] stagefright: avoid buffer overflow in base64 decoder am:
b4d9e1b413 am:
8710f4666e
Change-Id: I954737558188868ffe66a844acc4b268dc2918f4
Lajos Molnar [Tue, 15 Aug 2017 22:02:12 +0000 (22:02 +0000)]
[automerger] stagefright: avoid buffer overflow in base64 decoder am:
b4d9e1b413
Change-Id: I9ba3a1d3deffa395ef454da57bfeb4200943f190
Android Build Merger (Role) [Mon, 14 Aug 2017 23:58:17 +0000 (23:58 +0000)]
Merge "Merge changes from topic "am-
b89fd127-e87f-4013-8a91-
d8bfa01a2650" into lmp-mr1-app-dev am:
5293df6bb6" into mnc-dev
Android Build Merger (Role) [Mon, 14 Aug 2017 23:52:00 +0000 (23:52 +0000)]
[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into lmp-dev am:
cddbfe5496 am:
3c2b8586ad am:
5dc58ac31b
Change-Id: I068312923b05f1fb82d47331272515d294809317
Android Build Merger (Role) [Mon, 14 Aug 2017 23:51:56 +0000 (23:51 +0000)]
[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into lmp-dev am:
cddbfe5496 am:
3c2b8586ad
Change-Id: Ic6f76fbc3f7c128d8a6bad06bdf596e37701090f
Lajos Molnar [Mon, 14 Aug 2017 23:51:53 +0000 (23:51 +0000)]
Merge changes from topic "am-
b89fd127-e87f-4013-8a91-
d8bfa01a2650" into lmp-mr1-app-dev
am:
5293df6bb6
Change-Id: I54288e3fe8017dc920fead91513ea7ab6d22b849
Lajos Molnar [Mon, 14 Aug 2017 23:51:34 +0000 (23:51 +0000)]
Merge "stagefright: avoid buffer overflow in base64 decoder" into lmp-dev
am:
cddbfe5496
Change-Id: Ic03f8dbd9b54cd9a4899b10cb554e294155dcc6d
Lajos Molnar [Mon, 14 Aug 2017 23:30:11 +0000 (23:30 +0000)]
Merge "stagefright: avoid buffer overflow in base64 decoder" into lmp-dev
Lajos Molnar [Mon, 14 Aug 2017 23:30:11 +0000 (23:30 +0000)]
Merge changes from topic "am-
b89fd127-e87f-4013-8a91-
d8bfa01a2650" into mnc-dev
* changes:
[automerger] stagefright: avoid buffer overflow in base64 decoder am:
5e96386ab7 am:
5045de6f46 am:
8f6c537ffb
[automerger] stagefright: avoid buffer overflow in base64 decoder am:
5e96386ab7 am:
5045de6f46
[automerger] stagefright: avoid buffer overflow in base64 decoder am:
5e96386ab7
stagefright: avoid buffer overflow in base64 decoder
Lajos Molnar [Mon, 14 Aug 2017 23:30:11 +0000 (23:30 +0000)]
Merge changes from topic "am-
b89fd127-e87f-4013-8a91-
d8bfa01a2650" into lmp-mr1-app-dev
* changes:
[automerger] stagefright: avoid buffer overflow in base64 decoder am:
5e96386ab7 am:
5045de6f46
[automerger] stagefright: avoid buffer overflow in base64 decoder am:
5e96386ab7
stagefright: avoid buffer overflow in base64 decoder
Lajos Molnar [Mon, 14 Aug 2017 23:30:11 +0000 (23:30 +0000)]
Merge changes from topic "am-
b89fd127-e87f-4013-8a91-
d8bfa01a2650" into lmp-mr1-dev
* changes:
[automerger] stagefright: avoid buffer overflow in base64 decoder am:
5e96386ab7
stagefright: avoid buffer overflow in base64 decoder
Wei Jia [Mon, 14 Aug 2017 22:22:39 +0000 (22:22 +0000)]
[automerger] MPEG4Source: fix fragmented read. am:
5c57e911b4 am:
7445f0e400 am:
ab9bfb83b1 am:
da2d2587d3 am:
ca0bd10918 am:
442d5ba7b6
Change-Id: Ieb9ea8613b8f4ce3848344380cc79bbf252cb996
Wei Jia [Mon, 14 Aug 2017 22:22:33 +0000 (22:22 +0000)]
[automerger] MPEG4Source: fix fragmented read. am:
5c57e911b4 am:
7445f0e400 am:
ab9bfb83b1 am:
da2d2587d3 am:
ca0bd10918
Change-Id: I56303a18ee48e2032d1d937899bd73035f507eba
Wei Jia [Mon, 14 Aug 2017 22:22:28 +0000 (22:22 +0000)]
[automerger] MPEG4Source: fix fragmented read. am:
5c57e911b4 am:
7445f0e400 am:
ab9bfb83b1 am:
da2d2587d3
Change-Id: I3f836425d32d5e5cd53162c5dcbb0150a6947a95
Wei Jia [Mon, 14 Aug 2017 22:22:23 +0000 (22:22 +0000)]
[automerger] MPEG4Source: fix fragmented read. am:
5c57e911b4 am:
7445f0e400 am:
ab9bfb83b1
Change-Id: I33ebb671bd8f8b036bd585b70fff42f3d61c078f
Wei Jia [Mon, 14 Aug 2017 22:22:17 +0000 (22:22 +0000)]
[automerger] MPEG4Source: fix fragmented read. am:
5c57e911b4 am:
7445f0e400
Change-Id: I63d3ee56db210794a06b97f1283bebf978284f42
Wei Jia [Mon, 14 Aug 2017 22:22:12 +0000 (22:22 +0000)]
[automerger] MPEG4Source: fix fragmented read. am:
5c57e911b4
Change-Id: If51ef2fb8858fa23a4503f031e9a9127c975ef36
Wei Jia [Fri, 24 Mar 2017 21:04:05 +0000 (14:04 -0700)]
MPEG4Source: fix fragmented read.
Test: passed CTS test DecoderTest#testDecodeFragmented
Bug:
64314728
Bug:
36571704
Change-Id: I71ad6aaae473b03483f8405899d3178148597bba
(cherry picked from commit
ba9af7792dfed6e9b1b216aab91a97e713eec891)
(cherry picked from commit
6b401a337674f2f22b7589534700a33187899869)
Mikhail Naganov [Mon, 14 Aug 2017 19:37:19 +0000 (19:37 +0000)]
[automerger] Add EFFECT_CMD_SET_PARAM parameter checking to Downmix and Reverb am:
804632afcd am:
bc1d023cc9 am:
03c1ecd9fe am:
c4b06bbc1e am:
5c6acee104 am:
fcc98fa3b1
Change-Id: Ia0244b37df369a27b4bad024eef06cc56b5e64a2
Mikhail Naganov [Mon, 14 Aug 2017 19:37:13 +0000 (19:37 +0000)]
[automerger] Add EFFECT_CMD_SET_PARAM parameter checking to Downmix and Reverb am:
804632afcd am:
bc1d023cc9 am:
03c1ecd9fe am:
c4b06bbc1e am:
5c6acee104
Change-Id: I9127fb8696af5ef68ca122545ef6da09bba360c2
Mikhail Naganov [Mon, 14 Aug 2017 19:37:08 +0000 (19:37 +0000)]
[automerger] Add EFFECT_CMD_SET_PARAM parameter checking to Downmix and Reverb am:
804632afcd am:
bc1d023cc9 am:
03c1ecd9fe am:
c4b06bbc1e
Change-Id: I13d92901d6f54840bb2ff8a9802cdf94b690b8e2
Mikhail Naganov [Mon, 14 Aug 2017 19:37:03 +0000 (19:37 +0000)]
[automerger] Add EFFECT_CMD_SET_PARAM parameter checking to Downmix and Reverb am:
804632afcd am:
bc1d023cc9 am:
03c1ecd9fe
Change-Id: Iaaaead614bb1a1dbc62f0443e7e3e0d7d4fb9012
Mikhail Naganov [Mon, 14 Aug 2017 19:36:57 +0000 (19:36 +0000)]
[automerger] Add EFFECT_CMD_SET_PARAM parameter checking to Downmix and Reverb am:
804632afcd am:
bc1d023cc9
Change-Id: I8dfe1cdebec08b9ad5d3c7b19b8891158ac51132
Mikhail Naganov [Mon, 14 Aug 2017 19:36:51 +0000 (19:36 +0000)]
[automerger] Add EFFECT_CMD_SET_PARAM parameter checking to Downmix and Reverb am:
804632afcd
Change-Id: Ie44dd9c0d77ebcbc1b33603f06bb3fd3d86c6174
Lajos Molnar [Fri, 11 Aug 2017 21:06:20 +0000 (21:06 +0000)]
[automerger] stagefright: avoid buffer overflow in base64 decoder am:
5e96386ab7 am:
5045de6f46 am:
8f6c537ffb
Change-Id: I3ca735e893a638f412656f64bb3e857b6c863790
Lajos Molnar [Fri, 11 Aug 2017 21:06:14 +0000 (21:06 +0000)]
[automerger] stagefright: avoid buffer overflow in base64 decoder am:
5e96386ab7 am:
5045de6f46
Change-Id: Iddb5c897937a3acd8ee404a0d1f71ec5da22738e
Lajos Molnar [Fri, 11 Aug 2017 21:06:09 +0000 (21:06 +0000)]
[automerger] stagefright: avoid buffer overflow in base64 decoder am:
5e96386ab7
Change-Id: I5cd909195abd8ba442120aee597774f96c9db32d
Lajos Molnar [Tue, 27 Jun 2017 20:58:07 +0000 (13:58 -0700)]
stagefright: avoid buffer overflow in base64 decoder
Bug:
62673128
Change-Id: Id5f04b772aaca3184879bd5bca453ad9e82c7f94
Mikhail Naganov [Tue, 25 Jul 2017 00:25:47 +0000 (17:25 -0700)]
Add EFFECT_CMD_SET_PARAM parameter checking to Downmix and Reverb
Bug:
63662938
Bug:
63526567
Test: Added CTS tests
Change-Id: I8ed398cd62a9f461b0590e37f593daa3d8e4dbc4
Marco Nelissen [Fri, 4 Aug 2017 23:03:47 +0000 (23:03 +0000)]
Merge "Skip track if verification fails" into klp-dev am:
ab2c5046ef am:
f233415199 am:
87f1a3041d am:
222dca470e am:
ff9e1b0303
am:
6d050827c3 -s ours
Change-Id: I192b34239fc52c5532a0ea4ce71fc110639d462f
Marco Nelissen [Fri, 4 Aug 2017 22:56:40 +0000 (22:56 +0000)]
Merge "Skip track if verification fails" into klp-dev am:
ab2c5046ef am:
f233415199 am:
87f1a3041d am:
222dca470e
am:
ff9e1b0303
Change-Id: I57d1b50eea3a31fae57bd20f856a0ebc53e73357
Marco Nelissen [Fri, 4 Aug 2017 22:51:11 +0000 (22:51 +0000)]
Merge "Skip track if verification fails" into klp-dev am:
ab2c5046ef am:
f233415199 am:
87f1a3041d
am:
222dca470e
Change-Id: Icd722065f9256e7afec3e3d7f53c2aa5340856d8
Marco Nelissen [Fri, 4 Aug 2017 22:45:10 +0000 (22:45 +0000)]
Merge "Skip track if verification fails" into klp-dev am:
ab2c5046ef am:
f233415199
am:
87f1a3041d
Change-Id: I8fc2acbf9bbddbc4a401f51595752351c06acc79
Marco Nelissen [Fri, 4 Aug 2017 22:39:09 +0000 (22:39 +0000)]
Merge "Skip track if verification fails" into klp-dev am:
ab2c5046ef
am:
f233415199
Change-Id: I93a9b7b1f48953ec52d6c0f23e3141ddf6dc30f3
Marco Nelissen [Fri, 4 Aug 2017 22:33:10 +0000 (22:33 +0000)]
Merge "Skip track if verification fails" into klp-dev
am:
ab2c5046ef
Change-Id: Ica76922fc399fe0e5b6af23d613a2f6e5bc7820b
TreeHugger Robot [Fri, 4 Aug 2017 22:28:18 +0000 (22:28 +0000)]
Merge "Skip track if verification fails" into klp-dev
Marco Nelissen [Tue, 18 Jul 2017 21:57:11 +0000 (14:57 -0700)]
Skip track if verification fails
Bug:
62187433
Test: ran poc, CTS
Merged-In: Ib9b0b6de88d046d8149e9ea5073d6c40ffec7b0c
Change-Id: Ib9b0b6de88d046d8149e9ea5073d6c40ffec7b0c
TreeHugger Robot [Thu, 3 Aug 2017 20:44:43 +0000 (20:44 +0000)]
Merge "Fix memory leak in OggExtractor" into mnc-dev
Wei Jia [Thu, 3 Aug 2017 20:34:20 +0000 (20:34 +0000)]
MPEG4Source: fix fragmented read. am:
6b401a3376 am:
96114e7c5d
am:
bbc5c8fc60
Change-Id: I0844a8bac332664d4d8e668257c470b0a89addfe
Wei Jia [Thu, 3 Aug 2017 20:27:48 +0000 (20:27 +0000)]
MPEG4Source: fix fragmented read. am:
6b401a3376
am:
96114e7c5d
Change-Id: I8616480a004aa44e947939db7e5b8cce1b7ec72a
Wei Jia [Thu, 3 Aug 2017 20:21:48 +0000 (20:21 +0000)]
MPEG4Source: fix fragmented read.
am:
6b401a3376
Change-Id: I14b767357500d6680379c34ad74efdab1d7bb6ee
Dongwon Kang [Thu, 3 Aug 2017 19:58:37 +0000 (19:58 +0000)]
Merge "Skip track if verification fails" into mnc-dev
Wei Jia [Fri, 24 Mar 2017 21:04:05 +0000 (14:04 -0700)]
MPEG4Source: fix fragmented read.
Test: passed CTS test DecoderTest#testDecodeFragmented
Bug:
64314728
Bug:
36571704
Change-Id: I71ad6aaae473b03483f8405899d3178148597bba
(cherry picked from commit
ba9af7792dfed6e9b1b216aab91a97e713eec891)
Dongwon Kang [Thu, 20 Jul 2017 21:40:25 +0000 (14:40 -0700)]
Fix memory leak in OggExtractor
Test: added a temporal log and run poc
Bug:
63581671
Change-Id: I436a08e54d5e831f9fbdb33c26d15397ce1fbeba
Chong Zhang [Tue, 18 Jul 2017 22:41:13 +0000 (22:41 +0000)]
Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev am:
d371d08bcc am:
98248c3f88 am:
5f3ac3898d am:
aafbda5a18 am:
b226bba820
am:
8d579abf97
Change-Id: I91ae5b377da3c8b253ef481ec66646dfcc7fa590
Chong Zhang [Tue, 18 Jul 2017 22:39:13 +0000 (22:39 +0000)]
Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev am:
d371d08bcc am:
98248c3f88 am:
5f3ac3898d am:
aafbda5a18
am:
b226bba820
Change-Id: Iab6732cf5c86c6dec646df209e0f18b6c355780e
Chong Zhang [Tue, 18 Jul 2017 22:37:45 +0000 (22:37 +0000)]
Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev am:
d371d08bcc am:
98248c3f88 am:
5f3ac3898d
am:
aafbda5a18
Change-Id: I22778c380e1aa3d268e8e32ff7eb2a458f46e7ef
Chong Zhang [Tue, 18 Jul 2017 22:30:48 +0000 (22:30 +0000)]
Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev am:
d371d08bcc am:
98248c3f88
am:
5f3ac3898d
Change-Id: I22e4c53577164df13e5590d78dbd6796c1db06fe
Chong Zhang [Tue, 18 Jul 2017 22:26:46 +0000 (22:26 +0000)]
Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev am:
d371d08bcc
am:
98248c3f88
Change-Id: I87cf81565eefd8ed299014e7aa1e10a00daefc31
Chong Zhang [Tue, 18 Jul 2017 22:20:12 +0000 (22:20 +0000)]
Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev
am:
d371d08bcc
Change-Id: I6b7dcadbed62315968055d98dd2ffba3228016f9
Chong Zhang [Tue, 18 Jul 2017 22:16:14 +0000 (22:16 +0000)]
Merge "stagefright: fix crash due to bad timestamp index" into mnc-dev
Chong Zhang [Tue, 18 Jul 2017 22:14:50 +0000 (22:14 +0000)]
Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev
Marco Nelissen [Tue, 18 Jul 2017 21:57:11 +0000 (14:57 -0700)]
Skip track if verification fails
Bug:
62187433
Test: ran poc, CTS
Change-Id: Ib9b0b6de88d046d8149e9ea5073d6c40ffec7b0c
Wei Jia [Tue, 18 Jul 2017 19:25:49 +0000 (19:25 +0000)]
MediaPlayerService: fix access of mPlayer in client am:
502c2f4053 am:
bd7db202c6 am:
03fa67202f am:
263d5a2a70 am:
0844e1a3e8
am:
e0f4963584
Change-Id: I318dd6a90b2af9c4e879e4ab47cfad110002532d
Wei Jia [Tue, 18 Jul 2017 19:22:49 +0000 (19:22 +0000)]
MediaPlayerService: fix access of mPlayer in client am:
502c2f4053 am:
bd7db202c6 am:
03fa67202f am:
263d5a2a70
am:
0844e1a3e8
Change-Id: Ia6f8979298fdb783f4697734fd93fa4663d3da9b
Wei Jia [Tue, 18 Jul 2017 19:20:19 +0000 (19:20 +0000)]
MediaPlayerService: fix access of mPlayer in client am:
502c2f4053 am:
bd7db202c6 am:
03fa67202f
am:
263d5a2a70
Change-Id: I24e4ade61cbc0a03d20aa4b79b21fe18baa10e43
Wei Jia [Tue, 18 Jul 2017 19:12:37 +0000 (19:12 +0000)]
MediaPlayerService: fix access of mPlayer in client am:
502c2f4053 am:
bd7db202c6
am:
03fa67202f
Change-Id: I9336683351fa531560fadbe554eb218fc663585f
Wei Jia [Tue, 18 Jul 2017 19:05:35 +0000 (19:05 +0000)]
MediaPlayerService: fix access of mPlayer in client am:
502c2f4053
am:
bd7db202c6
Change-Id: If691af6c8d3c3849da52da943fd754ed9bd1fe0b
Wei Jia [Tue, 18 Jul 2017 19:01:03 +0000 (19:01 +0000)]
MediaPlayerService: fix access of mPlayer in client
am:
502c2f4053
Change-Id: Ib8920a866131f8db7bc0dce0472c257121297de6
Wei Jia [Fri, 14 Jul 2017 00:47:56 +0000 (17:47 -0700)]
MediaPlayerService: fix access of mPlayer in client
Test: poc doesn't crash
Bug:
38234812
Change-Id: I6f9be046ff66d2d5bed27bd712287e4ead550830
Wei Jia [Fri, 14 Jul 2017 23:58:32 +0000 (23:58 +0000)]
Merge "DO NOT MERGE : MPEG4Extractor: ensure returned status is checked." into klp-dev am:
da84963c1f am:
b8dfff52ee am:
5445ddc983 -s ours am:
8700c26a91 -s ours am:
b063a7ea18
am:
92fce7ece7 -s ours
Change-Id: I229ef1d97dc56703a19530f0202fe2f2e0f6ad74
Wei Jia [Fri, 14 Jul 2017 23:54:32 +0000 (23:54 +0000)]
Merge "DO NOT MERGE : MPEG4Extractor: ensure returned status is checked." into klp-dev am:
da84963c1f am:
b8dfff52ee am:
5445ddc983 -s ours am:
8700c26a91 -s ours
am:
b063a7ea18
Change-Id: I5075e05fa2c98f98197be580fc3640c884b9ba23
Wei Jia [Fri, 14 Jul 2017 23:50:31 +0000 (23:50 +0000)]
Merge "DO NOT MERGE : MPEG4Extractor: ensure returned status is checked." into klp-dev am:
da84963c1f am:
b8dfff52ee am:
5445ddc983 -s ours
am:
8700c26a91 -s ours
Change-Id: I08991c3961f9a820050d697a78a65ca70e728458
Wei Jia [Fri, 14 Jul 2017 23:42:36 +0000 (23:42 +0000)]
Merge "DO NOT MERGE : MPEG4Extractor: ensure returned status is checked." into klp-dev am:
da84963c1f am:
b8dfff52ee
am:
5445ddc983 -s ours
Change-Id: I556cccb83776d729f76b392192207637357f2292
Wei Jia [Fri, 14 Jul 2017 23:42:34 +0000 (23:42 +0000)]
Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into lmp-dev am:
61df326a5e -s ours am:
3092ed372c
am:
74952e9616 -s ours
Change-Id: I7fb63cc1f5e74e9c909cf493960c7191af11ea93
Wei Jia [Fri, 14 Jul 2017 23:38:32 +0000 (23:38 +0000)]
Merge "DO NOT MERGE : MPEG4Extractor: ensure returned status is checked." into klp-dev am:
da84963c1f
am:
b8dfff52ee
Change-Id: I3a6b2ea30ba7b97b92eea98d80dd05db42e0dc11
Wei Jia [Fri, 14 Jul 2017 23:38:31 +0000 (23:38 +0000)]
Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into lmp-dev am:
61df326a5e -s ours
am:
3092ed372c
Change-Id: I5f2b961f635981103348353c76ce8c58d3badfd2
Wei Jia [Fri, 14 Jul 2017 23:34:32 +0000 (23:34 +0000)]
Merge "DO NOT MERGE : MPEG4Extractor: ensure returned status is checked." into klp-dev
am:
da84963c1f
Change-Id: I979beafef27724be51e567fabc64b2b49ebb1a3b
Wei Jia [Fri, 14 Jul 2017 23:34:31 +0000 (23:34 +0000)]
Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into lmp-dev
am:
61df326a5e -s ours
Change-Id: I0bf4804b128f23a8e8dbf2ed291d18a63468b488
OSDN Git Service
