OSDN Git Service
Eric Laurent [Tue, 10 Oct 2017 21:24:30 +0000 (21:24 +0000)]
Merge "Soundtrigger service: fix cross deadlock with audio policy service" into lmp-mr1-dev
Lajos Molnar [Tue, 10 Oct 2017 21:09:20 +0000 (21:09 +0000)]
Merge "OMXNodeInstance: use a lock in freeNode" into lmp-mr1-dev
Wei Jia [Tue, 10 Oct 2017 21:02:23 +0000 (21:02 +0000)]
Merge changes from topic "
b23270724" into lmp-dev
am:
5802bad0f4
Change-Id: Ia8bf24ccbc446fd0a66e132f914d9e3c835b87b9
TreeHugger Robot [Tue, 10 Oct 2017 20:56:11 +0000 (20:56 +0000)]
Merge changes from topic "
b23270724" into lmp-dev
* changes:
MediaExtractor: ensure users to check returned value by getTrack.
Don't CHECK if the source can't be started
Jeff Tinker [Tue, 10 Oct 2017 19:02:45 +0000 (19:02 +0000)]
Fix information disclosure in mediadrmserver
am:
b41a527176
Change-Id: Iee7d26d93e639cc7b7e0bb3de8b788090822a609
Jeff Tinker [Mon, 9 Oct 2017 18:52:18 +0000 (11:52 -0700)]
Fix information disclosure in mediadrmserver
Test:poc provided in bug
bug:
62872384
Change-Id: I3d104a2a64a0cb81e9fd5b04c4def1fbee64da2d
Eric Laurent [Thu, 5 Oct 2017 17:58:38 +0000 (10:58 -0700)]
Soundtrigger service: fix cross deadlock with audio policy service
Do not hold Module mutex when calling into audio policy manager to
avoid cross deadlock with audio poicy service mutex: Audio policy manager
can call into sound trigger service with its mutex held in methods like
stopInput().
Regression introduced by fix for b/
64340921 commit
f759b8c4
Bug:
64340921
Bug:
67310830
Test: repro steps in b/
67310830
Merged-In: Ie50b2e7c55fe9828a3fd8de6b31eb4a492791583
Change-Id: Ie50b2e7c55fe9828a3fd8de6b31eb4a492791583
Wonsik Kim [Wed, 4 Oct 2017 23:57:58 +0000 (23:57 +0000)]
Merge "m4v_h263: fix global buffer overflow" into lmp-dev
am:
c41471f6df
Change-Id: I7d699fe6c4067c992ab64f03c924b04d438f5c78
TreeHugger Robot [Wed, 4 Oct 2017 23:42:01 +0000 (23:42 +0000)]
Merge "m4v_h263: fix global buffer overflow" into lmp-dev
Wei Jia [Fri, 28 Apr 2017 17:20:07 +0000 (10:20 -0700)]
MediaExtractor: ensure users to check returned value by getTrack.
Test: fix the crash from the stream in the bug.
Bug:
37777357
Change-Id: Ia99907c396a2074a9419db9b8103a9325b290169
Marco Nelissen [Thu, 1 Sep 2016 20:12:24 +0000 (13:12 -0700)]
Don't CHECK if the source can't be started
Bug:
19779574
Bug:
31156921
Change-Id: I770619949ed211dab301ee3da10069d319279715
Marco Nelissen [Wed, 13 Sep 2017 05:51:52 +0000 (05:51 +0000)]
Merge "Fix memory leaks" into lmp-dev
am:
3e913a793c
Change-Id: I1daa8fed661c7d6fa7154fef9d183efdacaa63fb
Marco Nelissen [Wed, 13 Sep 2017 05:00:01 +0000 (05:00 +0000)]
Merge "Fix memory leaks" into lmp-dev
Andy Hung [Tue, 12 Sep 2017 01:30:39 +0000 (01:30 +0000)]
Merge "AudioPolicyService: Acquire mutex for SoundTriggerSession" into lmp-dev
am:
35a587cdc5
Change-Id: I673c315dadc97b06ceb75d552c22e3ce5e0629bc
Andy Hung [Tue, 12 Sep 2017 00:58:24 +0000 (00:58 +0000)]
Merge "AudioPolicyService: Acquire mutex for SoundTriggerSession" into lmp-dev
TreeHugger Robot [Mon, 11 Sep 2017 22:03:19 +0000 (22:03 +0000)]
Merge "Track graphic buffer mode in OMXNodeInstance" into lmp-mr1-dev
Andy Hung [Mon, 11 Sep 2017 19:22:23 +0000 (19:22 +0000)]
Merge "EffectBundle: Check parameter and value size" into lmp-dev
am:
57ad9301e7
Change-Id: Ie783b9a68e25f4a90f02936608114fc89ab788a6
Andy Hung [Mon, 11 Sep 2017 18:40:03 +0000 (18:40 +0000)]
Merge "EffectBundle: Check parameter and value size" into lmp-dev
Dongwon Kang [Wed, 30 Aug 2017 23:55:26 +0000 (16:55 -0700)]
Track graphic buffer mode in OMXNodeInstance
Test: cts-tradefed run cts -p android.media & YT & Play Movies & Cast
Bug:
62948670
Merged-In: Icbd9b767f1aef005819e680f77f4a05041988f34
Change-Id: Icbd9b767f1aef005819e680f77f4a05041988f34
Dongwon Kang [Mon, 11 Sep 2017 17:28:50 +0000 (17:28 +0000)]
Merge "Track graphic buffer mode in OMXNodeInstance" into lmp-dev
am:
7b27979c5e -s ours
Change-Id: I02cadfefbea7da31716904c6530bd0f1fe52cf8a
Dongwon Kang [Mon, 11 Sep 2017 16:49:14 +0000 (16:49 +0000)]
Block allocateBackup if the node is not secure node.
am:
996be3eef1
Change-Id: Ib79c7d8d079da2da2cd7742a089ee66a1fe8efd4
Dongwon Kang [Mon, 11 Sep 2017 16:35:48 +0000 (16:35 +0000)]
Merge "Track graphic buffer mode in OMXNodeInstance" into lmp-dev
Lajos Molnar [Thu, 7 Sep 2017 23:37:39 +0000 (16:37 -0700)]
OMXNodeInstance: use a lock in freeNode
This is to avoid a concurrent use after free if other OMX commands
are being executed before the node is marked as deleted.
Bug:
63666573
Change-Id: I7720dd900bfa252f8675e0c56191adbf52aa957e
Wonsik Kim [Thu, 7 Sep 2017 23:17:05 +0000 (16:17 -0700)]
m4v_h263: fix global buffer overflow
Bug:
65025028
Test: run POC
Change-Id: Ifa5cf0e3ced7188ed70849b04b57828518ccb5bf
Dongwon Kang [Wed, 30 Aug 2017 23:55:26 +0000 (16:55 -0700)]
Track graphic buffer mode in OMXNodeInstance
Test: cts-tradefed run cts -p android.media & YT & Play Movies & Cast
Bug:
62948670
Merged-In: Icbd9b767f1aef005819e680f77f4a05041988f34
Change-Id: Icbd9b767f1aef005819e680f77f4a05041988f34
Marco Nelissen [Wed, 6 Sep 2017 22:14:55 +0000 (15:14 -0700)]
Fix memory leaks
Bug:
64424279
Change-Id: I814f81d8e050132be7779310d3f1ab6b19f2e593
Andy Hung [Fri, 18 Aug 2017 02:00:57 +0000 (19:00 -0700)]
EffectBundle: Check parameter and value size
Test: POC CTS AudioEffectTest
Bug:
64477217
Bug:
64478003
Merged-In: Ia5e6ecb5a356daf5f3fa085d1055748f638795d9
Change-Id: Ia5e6ecb5a356daf5f3fa085d1055748f638795d9
Dongwon Kang [Wed, 30 Aug 2017 21:37:14 +0000 (14:37 -0700)]
Block allocateBackup if the node is not secure node.
Bug:
63522818
Test: cts-tradefed run cts -p android.media & YT & Play Movies & Cast
Change-Id: I2be2748ecabf49d7842a90676e68978bf0c56b71
Merged-In: I2be2748ecabf49d7842a90676e68978bf0c56b71
Dongwon Kang [Wed, 16 Aug 2017 18:48:54 +0000 (18:48 +0000)]
Merge "Check buffer size in useBuffer in software components" into klp-dev am:
c65287a08c am:
5dfd2b5d9f am:
f84e9b9169
am:
0d7d0ab16e
Change-Id: If958b023d571cabf9b180daaa6f7049e148cbe35
Dongwon Kang [Wed, 16 Aug 2017 18:43:50 +0000 (18:43 +0000)]
Merge "Check buffer size in useBuffer in software components" into klp-dev am:
c65287a08c am:
5dfd2b5d9f
am:
f84e9b9169
Change-Id: Ic4b40082b3a42c470e4cea5d7efb19c32ba47030
Dongwon Kang [Wed, 16 Aug 2017 18:40:50 +0000 (18:40 +0000)]
Merge "Check buffer size in useBuffer in software components" into klp-dev am:
c65287a08c
am:
5dfd2b5d9f
Change-Id: I353d7057154a79d1ef44614450e75d123885be27
Dongwon Kang [Wed, 16 Aug 2017 18:32:19 +0000 (18:32 +0000)]
Merge "Check buffer size in useBuffer in software components" into klp-dev
am:
c65287a08c
Change-Id: I4b97f1df29bc3a2be401542be525c85880987b9b
Android Build Merger (Role) [Wed, 16 Aug 2017 18:19:51 +0000 (18:19 +0000)]
[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into klp-dev am:
9e41bec8d3 -s ours am:
c1e3b0cda0 am:
f6ae88fdec am:
398d2167a0
Change-Id: Iba67f3a765f9398b8ce0c2b90aa13be1a9669ba7
Android Build Merger (Role) [Wed, 16 Aug 2017 18:19:46 +0000 (18:19 +0000)]
[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into klp-dev am:
9e41bec8d3 -s ours am:
c1e3b0cda0 am:
f6ae88fdec
Change-Id: I8523a6a7220d1b6022965cd7df1b736b06aeee02
Android Build Merger (Role) [Wed, 16 Aug 2017 18:19:42 +0000 (18:19 +0000)]
[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into klp-dev am:
9e41bec8d3 -s ours am:
c1e3b0cda0
Change-Id: I203f15b2b318b43ef01ab2e741a2cec7a5a55e5c
Lajos Molnar [Wed, 16 Aug 2017 18:19:15 +0000 (18:19 +0000)]
Merge "stagefright: avoid buffer overflow in base64 decoder" into klp-dev
am:
9e41bec8d3 -s ours
Change-Id: I8e3a43273b89ae97ccba0715d99e9dc5286821ef
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
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
TreeHugger Robot [Tue, 15 Aug 2017 23:44:25 +0000 (23:44 +0000)]
Merge "Check buffer size in useBuffer in software components" into klp-dev
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 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 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
Lajos Molnar [Tue, 15 Aug 2017 23:03:50 +0000 (23:03 +0000)]
Merge "stagefright: avoid buffer overflow in base64 decoder" into klp-dev
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: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
Andy Hung [Tue, 15 Aug 2017 19:48:54 +0000 (12:48 -0700)]
AudioPolicyService: Acquire mutex for SoundTriggerSession
Test: Enable always on GSA
Bug:
64340921
Merged-In: I05d8c680be97ba4c92081425596addcc038f7dda
Change-Id: I05d8c680be97ba4c92081425596addcc038f7dda
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 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: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: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: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 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
Wei Jia [Thu, 3 Aug 2017 20:21:48 +0000 (20:21 +0000)]
MPEG4Source: fix fragmented read.
am:
6b401a3376
Change-Id: I14b767357500d6680379c34ad74efdab1d7bb6ee
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)
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:14:50 +0000 (22:14 +0000)]
Merge "stagefright: check aac_frame_length to prevent infinite loop" into klp-dev
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: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: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: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
Wei Jia [Fri, 14 Jul 2017 23:26:09 +0000 (23:26 +0000)]
Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into lmp-dev
Wei Jia [Fri, 14 Jul 2017 23:25:32 +0000 (23:25 +0000)]
Merge "DO NOT MERGE : MPEG4Extractor: ensure returned status is checked." into klp-dev
Eric Laurent [Mon, 10 Jul 2017 20:13:34 +0000 (20:13 +0000)]
Merge "audio effects: filter reserved effect commands" into klp-dev am:
f57dc8b72f am:
dc2efe3808 am:
4324bdc8f7
am:
acbb8e7dd1
Change-Id: Ie2cd641decc7e654f021df75fd4f600f7255eea2
Eric Laurent [Mon, 10 Jul 2017 20:09:02 +0000 (20:09 +0000)]
Merge "audio effects: filter reserved effect commands" into klp-dev am:
f57dc8b72f am:
dc2efe3808
am:
4324bdc8f7
Change-Id: I161bc14d3059af24463cfa4f473305b516a3bcd8
Eric Laurent [Mon, 10 Jul 2017 20:04:31 +0000 (20:04 +0000)]
Merge "audio effects: filter reserved effect commands" into klp-dev am:
f57dc8b72f
am:
dc2efe3808
Change-Id: I7a613ea97315971ce0abfc34ce5f1fc4034d5ad8