OSDN Git Service
Chong Zhang [Tue, 18 Jul 2017 22:52:49 +0000 (22:52 +0000)]
Merge "stagefright: fix crash due to bad timestamp index" into mnc-dev am:
7da8bef65e am:
998521559a am:
0b542a3789 am:
e1e8ea6a19 am:
a29bd6a709 am:
d7c144c545 am:
3fd727d787 am:
33e76e05a3 am:
dfd2808073
am:
db22689ffa
Change-Id: I8e581c4db0b00ab4211c3a807d0370d56bf43ea1
Chong Zhang [Tue, 18 Jul 2017 22:49:46 +0000 (22:49 +0000)]
Merge "stagefright: fix crash due to bad timestamp index" into mnc-dev am:
7da8bef65e am:
998521559a am:
0b542a3789 am:
e1e8ea6a19 am:
a29bd6a709 am:
d7c144c545 am:
3fd727d787 am:
33e76e05a3
am:
dfd2808073
Change-Id: Ia5a7017d7c4e12b8ef57017c4ff5b11d591ce8a2
Chong Zhang [Tue, 18 Jul 2017 22:47:43 +0000 (22:47 +0000)]
Merge "stagefright: fix crash due to bad timestamp index" into mnc-dev am:
7da8bef65e am:
998521559a am:
0b542a3789 am:
e1e8ea6a19 am:
a29bd6a709 am:
d7c144c545 am:
3fd727d787
am:
33e76e05a3
Change-Id: I09e13de158a6de8e283e8e62c7eafdccc562d76b
Chong Zhang [Tue, 18 Jul 2017 22:43:43 +0000 (22:43 +0000)]
Merge "stagefright: fix crash due to bad timestamp index" into mnc-dev am:
7da8bef65e am:
998521559a am:
0b542a3789 am:
e1e8ea6a19 am:
a29bd6a709 am:
d7c144c545
am:
3fd727d787
Change-Id: I4e7d44aae1663f1bc0f3d3954cccc8a6fc79bb18
Chong Zhang [Tue, 18 Jul 2017 22:41:12 +0000 (22:41 +0000)]
Merge "stagefright: fix crash due to bad timestamp index" into mnc-dev am:
7da8bef65e am:
998521559a am:
0b542a3789 am:
e1e8ea6a19 am:
a29bd6a709
am:
d7c144c545
Change-Id: I123cc98202640afedae7854ef00daa02061f1be0
Chong Zhang [Tue, 18 Jul 2017 22:39:12 +0000 (22:39 +0000)]
Merge "stagefright: fix crash due to bad timestamp index" into mnc-dev am:
7da8bef65e am:
998521559a am:
0b542a3789 am:
e1e8ea6a19
am:
a29bd6a709
Change-Id: If392d8e94a7973026ae9f26beae944bfe7256c16
Chong Zhang [Tue, 18 Jul 2017 22:37:46 +0000 (22:37 +0000)]
Merge "stagefright: fix crash due to bad timestamp index" into mnc-dev am:
7da8bef65e am:
998521559a am:
0b542a3789
am:
e1e8ea6a19
Change-Id: I10c20451e88d85fd8a9a2ba24456708ca3612f53
Chong Zhang [Tue, 18 Jul 2017 22:30:48 +0000 (22:30 +0000)]
Merge "stagefright: fix crash due to bad timestamp index" into mnc-dev am:
7da8bef65e am:
998521559a
am:
0b542a3789
Change-Id: Ice81acc494ab5405f281f6132c39a7b64fe3e94d
Chong Zhang [Tue, 18 Jul 2017 22:26:47 +0000 (22:26 +0000)]
Merge "stagefright: fix crash due to bad timestamp index" into mnc-dev am:
7da8bef65e
am:
998521559a
Change-Id: I5515052572a4c271ebd277b3a4c6380f5327a166
Chong Zhang [Tue, 18 Jul 2017 22:22:12 +0000 (22:22 +0000)]
Merge "stagefright: fix crash due to bad timestamp index" into mnc-dev
am:
7da8bef65e
Change-Id: I71d87fce28528a608792b2087951d302c8ddfc21
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
Wei Jia [Tue, 18 Jul 2017 19:51:24 +0000 (19:51 +0000)]
MediaPlayerService: fix access of mPlayer in client am:
502c2f4053 am:
bd7db202c6 am:
03fa67202f am:
263d5a2a70 am:
0844e1a3e8 am:
e0f4963584 am:
5cc9f8780c am:
93ae13644b am:
50280c1b44 am:
1a1bb632e7 am:
d8192c9149 am:
6f7295a384 am:
830ecba34d am:
ee04f896ca am:
b65bc512d1
am:
6b79fa9965
Change-Id: I05c6510ddd4abd449e3bf75ec3d8ae8fdaa45917
Wei Jia [Tue, 18 Jul 2017 19:49:21 +0000 (19:49 +0000)]
MediaPlayerService: fix access of mPlayer in client am:
502c2f4053 am:
bd7db202c6 am:
03fa67202f am:
263d5a2a70 am:
0844e1a3e8 am:
e0f4963584 am:
5cc9f8780c am:
93ae13644b am:
50280c1b44 am:
1a1bb632e7 am:
d8192c9149 am:
6f7295a384 am:
830ecba34d am:
ee04f896ca
am:
b65bc512d1
Change-Id: Id341ee30610d4c1e887a71b0deb1ddef3f325f48
Wei Jia [Tue, 18 Jul 2017 19:46:21 +0000 (19:46 +0000)]
MediaPlayerService: fix access of mPlayer in client am:
502c2f4053 am:
bd7db202c6 am:
03fa67202f am:
263d5a2a70 am:
0844e1a3e8 am:
e0f4963584 am:
5cc9f8780c am:
93ae13644b am:
50280c1b44 am:
1a1bb632e7 am:
d8192c9149 am:
6f7295a384 am:
830ecba34d
am:
ee04f896ca
Change-Id: I06975720cf540f36b1501bf66dcf9cf16ec7512c
Wei Jia [Tue, 18 Jul 2017 19:43:51 +0000 (19:43 +0000)]
MediaPlayerService: fix access of mPlayer in client am:
502c2f4053 am:
bd7db202c6 am:
03fa67202f am:
263d5a2a70 am:
0844e1a3e8 am:
e0f4963584 am:
5cc9f8780c am:
93ae13644b am:
50280c1b44 am:
1a1bb632e7 am:
d8192c9149 am:
6f7295a384
am:
830ecba34d
Change-Id: Iac159cbf205fb02aa600d8b136e70b6d71b44924
Wei Jia [Tue, 18 Jul 2017 19:40:51 +0000 (19:40 +0000)]
MediaPlayerService: fix access of mPlayer in client am:
502c2f4053 am:
bd7db202c6 am:
03fa67202f am:
263d5a2a70 am:
0844e1a3e8 am:
e0f4963584 am:
5cc9f8780c am:
93ae13644b am:
50280c1b44 am:
1a1bb632e7 am:
d8192c9149
am:
6f7295a384
Change-Id: I7f6837cd4aced5a6d83aaf0279cc3908f80a4027
Wei Jia [Tue, 18 Jul 2017 19:39:21 +0000 (19:39 +0000)]
MediaPlayerService: fix access of mPlayer in client am:
502c2f4053 am:
bd7db202c6 am:
03fa67202f am:
263d5a2a70 am:
0844e1a3e8 am:
e0f4963584 am:
5cc9f8780c am:
93ae13644b am:
50280c1b44 am:
1a1bb632e7
am:
d8192c9149
Change-Id: I25ed67aa5671f7484dc99d3d79e0ed33125117f6
Wei Jia [Tue, 18 Jul 2017 19:36:19 +0000 (19:36 +0000)]
MediaPlayerService: fix access of mPlayer in client am:
502c2f4053 am:
bd7db202c6 am:
03fa67202f am:
263d5a2a70 am:
0844e1a3e8 am:
e0f4963584 am:
5cc9f8780c am:
93ae13644b am:
50280c1b44
am:
1a1bb632e7
Change-Id: I7cd886d0bbe96dcf8aafe082649d2a9a7c1c303e
Wei Jia [Tue, 18 Jul 2017 19:33:18 +0000 (19:33 +0000)]
MediaPlayerService: fix access of mPlayer in client am:
502c2f4053 am:
bd7db202c6 am:
03fa67202f am:
263d5a2a70 am:
0844e1a3e8 am:
e0f4963584 am:
5cc9f8780c am:
93ae13644b
am:
50280c1b44
Change-Id: Ie10440f1e789a5b8853726cd91d7705228c3b19f
Wei Jia [Tue, 18 Jul 2017 19:30:50 +0000 (19:30 +0000)]
MediaPlayerService: fix access of mPlayer in client am:
502c2f4053 am:
bd7db202c6 am:
03fa67202f am:
263d5a2a70 am:
0844e1a3e8 am:
e0f4963584 am:
5cc9f8780c
am:
93ae13644b
Change-Id: I16649e1417e36610e0731da5c47c90a9de169d13
Wei Jia [Tue, 18 Jul 2017 19:28:47 +0000 (19:28 +0000)]
MediaPlayerService: fix access of mPlayer in client am:
502c2f4053 am:
bd7db202c6 am:
03fa67202f am:
263d5a2a70 am:
0844e1a3e8 am:
e0f4963584
am:
5cc9f8780c
Change-Id: Icb93a3b48a1674066fbf0b07bf11cda56ab22436
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
Eric Laurent [Sat, 15 Jul 2017 01:00:06 +0000 (01:00 +0000)]
Merge "audio effects: filter reserved effect commands" into nyc-mr1-dev am:
125fc63d73 am:
a5d728cce1 am:
ccd8680538
am:
dd36008b78
Change-Id: I4ffd95bcaa4dd9a6637c93e85d4c3c18c0a7f89f
Eric Laurent [Sat, 15 Jul 2017 00:56:06 +0000 (00:56 +0000)]
Merge "audio effects: filter reserved effect commands" into nyc-mr1-dev am:
125fc63d73 am:
a5d728cce1
am:
ccd8680538
Change-Id: I0af69333bcb67ef6534175ce986fc05e5a26ffa6
Eric Laurent [Sat, 15 Jul 2017 00:52:06 +0000 (00:52 +0000)]
Merge "audio effects: filter reserved effect commands" into nyc-mr1-dev am:
125fc63d73
am:
a5d728cce1
Change-Id: I82e1af7e7ff4b7dcc7a9b1121893f7514fdbf05d
Eric Laurent [Sat, 15 Jul 2017 00:48:07 +0000 (00:48 +0000)]
Merge "audio effects: filter reserved effect commands" into nyc-mr1-dev
am:
125fc63d73
Change-Id: I33f038d357f2f698df9b37f09ac03e72c32b9bd8
Wei Jia [Sat, 15 Jul 2017 00:40:10 +0000 (00:40 +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 am:
3627617c2b am:
671c88a807 am:
1feb9dca54 am:
29b801537c -s ours am:
e68844ffb0 am:
bd6594eaf2 am:
301e363ed5 am:
8ea826e20d am:
4fa1ff8958 -s ours
am:
024216f32b
Change-Id: I9d8f260ec6c5837930b20076377b2c11774b6cc4
TreeHugger Robot [Sat, 15 Jul 2017 00:39:40 +0000 (00:39 +0000)]
Merge "audio effects: filter reserved effect commands" into nyc-mr1-dev
Wei Jia [Sat, 15 Jul 2017 00:35:36 +0000 (00:35 +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 am:
3627617c2b am:
671c88a807 am:
1feb9dca54 am:
29b801537c -s ours am:
e68844ffb0 am:
bd6594eaf2 am:
301e363ed5 am:
8ea826e20d
am:
4fa1ff8958 -s ours
Change-Id: I9a005a4cd15a78c8cc8147e0820c8861c4a14b54
Wei Jia [Sat, 15 Jul 2017 00:31:38 +0000 (00:31 +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 am:
3627617c2b am:
671c88a807 am:
1feb9dca54 am:
29b801537c -s ours am:
e68844ffb0 am:
bd6594eaf2 am:
301e363ed5
am:
8ea826e20d
Change-Id: I103d3f965c85f35e99efb9f1ebd30f9d53efaea5
Wei Jia [Sat, 15 Jul 2017 00:27:07 +0000 (00:27 +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 am:
3627617c2b am:
671c88a807 am:
1feb9dca54 am:
29b801537c -s ours am:
e68844ffb0 am:
bd6594eaf2
am:
301e363ed5
Change-Id: Ie302f86f5110b63b0c1d866c35c7c88f4577cac9
Wei Jia [Sat, 15 Jul 2017 00:27:07 +0000 (00:27 +0000)]
Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into lmp-dev am:
61df326a5e -s ours am:
3092ed372c am:
74952e9616 -s ours am:
162672a9f6 am:
9215fa05fe am:
6757de98ca am:
a32f7beef6 -s ours am:
04e0e9c697 am:
eb81b99c4a am:
bb3f0c8d1c am:
9c8bf537e2 am:
76301f781d -s ours
am:
d3e64e7e1e
Change-Id: I7f92da08275fc9e4e71485dabcd44a9a5a1b85c7
Wei Jia [Sat, 15 Jul 2017 00:23:05 +0000 (00:23 +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 am:
3627617c2b am:
671c88a807 am:
1feb9dca54 am:
29b801537c -s ours am:
e68844ffb0
am:
bd6594eaf2
Change-Id: I864241ad497a7a59f870103f23e1306fa1dc519d
Wei Jia [Sat, 15 Jul 2017 00:23:04 +0000 (00:23 +0000)]
Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into lmp-dev am:
61df326a5e -s ours am:
3092ed372c am:
74952e9616 -s ours am:
162672a9f6 am:
9215fa05fe am:
6757de98ca am:
a32f7beef6 -s ours am:
04e0e9c697 am:
eb81b99c4a am:
bb3f0c8d1c am:
9c8bf537e2
am:
76301f781d -s ours
Change-Id: I8739fcae53e81f21ab6843a467dd442856666ce2
Wei Jia [Sat, 15 Jul 2017 00:18:38 +0000 (00:18 +0000)]
Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into lmp-dev am:
61df326a5e -s ours am:
3092ed372c am:
74952e9616 -s ours am:
162672a9f6 am:
9215fa05fe am:
6757de98ca am:
a32f7beef6 -s ours am:
04e0e9c697 am:
eb81b99c4a am:
bb3f0c8d1c
am:
9c8bf537e2
Change-Id: I82d00420fc16adcc7104344c7ffb10d2d9b661f7
Wei Jia [Sat, 15 Jul 2017 00:18:37 +0000 (00:18 +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 am:
3627617c2b am:
671c88a807 am:
1feb9dca54 am:
29b801537c -s ours
am:
e68844ffb0
Change-Id: I6546b41a2da12c64db52ed9081ebf20c53eec469
Wei Jia [Sat, 15 Jul 2017 00:14:36 +0000 (00:14 +0000)]
Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into lmp-dev am:
61df326a5e -s ours am:
3092ed372c am:
74952e9616 -s ours am:
162672a9f6 am:
9215fa05fe am:
6757de98ca am:
a32f7beef6 -s ours am:
04e0e9c697 am:
eb81b99c4a
am:
bb3f0c8d1c
Change-Id: I739d1eb58978819df7e0fd8489201c30cb29ca28
Wei Jia [Sat, 15 Jul 2017 00:14:36 +0000 (00:14 +0000)]
Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into mnc-dev am:
80059d44c4 am:
72840f2216 am:
9e9987c46d am:
9583ca702a -s ours am:
acf3c39437 am:
d1ce7bb7c8 am:
bd951d1c5c am:
570dd1184d am:
7475e7996a -s ours
am:
5652b2b4d9
Change-Id: I313764e4cb8dd0fbede7ae9ce7a6aacc2c262a82
Wei Jia [Sat, 15 Jul 2017 00:14:35 +0000 (00:14 +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 am:
3627617c2b am:
671c88a807 am:
1feb9dca54
am:
29b801537c -s ours
Change-Id: I0b3318fac39fae495963b005d22a3d954798b5f9
Wei Jia [Sat, 15 Jul 2017 00:10:36 +0000 (00:10 +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 am:
3627617c2b am:
671c88a807
am:
1feb9dca54
Change-Id: I1ee61709a12f2045eb946dad3946fa8aafee2caf
Wei Jia [Sat, 15 Jul 2017 00:10:36 +0000 (00:10 +0000)]
Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into lmp-dev am:
61df326a5e -s ours am:
3092ed372c am:
74952e9616 -s ours am:
162672a9f6 am:
9215fa05fe am:
6757de98ca am:
a32f7beef6 -s ours am:
04e0e9c697
am:
eb81b99c4a
Change-Id: I708670b95e61a05ef2592fd0fef2615e54aebb1d
Wei Jia [Sat, 15 Jul 2017 00:10:32 +0000 (00:10 +0000)]
Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into mnc-dev am:
80059d44c4 am:
72840f2216 am:
9e9987c46d am:
9583ca702a -s ours am:
acf3c39437 am:
d1ce7bb7c8 am:
bd951d1c5c am:
570dd1184d
am:
7475e7996a -s ours
Change-Id: I4d0b520a58b87d750d65450e270a314ff9aa7897
Wei Jia [Sat, 15 Jul 2017 00:06:35 +0000 (00:06 +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 am:
3627617c2b
am:
671c88a807
Change-Id: Idf5e9e2fd694682031a3b98e53469a3d617c375d
Wei Jia [Sat, 15 Jul 2017 00:06:35 +0000 (00:06 +0000)]
Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into lmp-dev am:
61df326a5e -s ours am:
3092ed372c am:
74952e9616 -s ours am:
162672a9f6 am:
9215fa05fe am:
6757de98ca am:
a32f7beef6 -s ours
am:
04e0e9c697
Change-Id: Ib0e54fbe12d38aa3c2517e7dff4863e2fa2cb4cb
Wei Jia [Sat, 15 Jul 2017 00:06:34 +0000 (00:06 +0000)]
Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into mnc-dev am:
80059d44c4 am:
72840f2216 am:
9e9987c46d am:
9583ca702a -s ours am:
acf3c39437 am:
d1ce7bb7c8 am:
bd951d1c5c
am:
570dd1184d
Change-Id: I213374dc538eb926060df27b10721c9606bcd56c
Wei Jia [Sat, 15 Jul 2017 00:02:04 +0000 (00:02 +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
am:
3627617c2b
Change-Id: I6f4f806ac57f4bf75bc0963f477372d4afa8bfc3
Wei Jia [Sat, 15 Jul 2017 00:02:02 +0000 (00:02 +0000)]
Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into mnc-dev am:
80059d44c4 am:
72840f2216 am:
9e9987c46d am:
9583ca702a -s ours am:
acf3c39437 am:
d1ce7bb7c8
am:
bd951d1c5c
Change-Id: I0ff608f66320230f34dc793b9dda746fce627d51
Wei Jia [Sat, 15 Jul 2017 00:02:02 +0000 (00:02 +0000)]
Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into lmp-dev am:
61df326a5e -s ours am:
3092ed372c am:
74952e9616 -s ours am:
162672a9f6 am:
9215fa05fe am:
6757de98ca
am:
a32f7beef6 -s ours
Change-Id: If81402f72f73362e4f642b77a433be09675d2b55
Wei Jia [Fri, 14 Jul 2017 23:58:34 +0000 (23:58 +0000)]
Merge "MPEG4Extractor: ensure returned status is checked." into nyc-dev am:
02772b134e am:
2aa463e371 am:
4fa11b6cdf am:
ae73886c4d am:
447c686405
am:
4865242a90
Change-Id: I3585c7570927adcdc4868482b573ac25323848d3
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:58:32 +0000 (23:58 +0000)]
Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into lmp-dev am:
61df326a5e -s ours am:
3092ed372c am:
74952e9616 -s ours am:
162672a9f6 am:
9215fa05fe
am:
6757de98ca
Change-Id: I0ef1aea5d384a742e4b9acc7c55b60ad1bba1079
Wei Jia [Fri, 14 Jul 2017 23:58:32 +0000 (23:58 +0000)]
Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into mnc-dev am:
80059d44c4 am:
72840f2216 am:
9e9987c46d am:
9583ca702a -s ours am:
acf3c39437
am:
d1ce7bb7c8
Change-Id: Ib2d891e80b63e42c76ae037f3d41bc5eb4ab3cb5
Wei Jia [Fri, 14 Jul 2017 23:54:33 +0000 (23:54 +0000)]
Merge "MPEG4Extractor: ensure returned status is checked." into nyc-dev am:
02772b134e am:
2aa463e371 am:
4fa11b6cdf am:
ae73886c4d
am:
447c686405
Change-Id: Ic055907befc7997969a14e6e5ad0314aacfe04af
Wei Jia [Fri, 14 Jul 2017 23:54:33 +0000 (23:54 +0000)]
Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into lmp-dev am:
61df326a5e -s ours am:
3092ed372c am:
74952e9616 -s ours am:
162672a9f6
am:
9215fa05fe
Change-Id: Ia3dc7340a54e5dc27ce7bf6781052d7cb506d966
Wei Jia [Fri, 14 Jul 2017 23:54:33 +0000 (23:54 +0000)]
Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into mnc-dev am:
80059d44c4 am:
72840f2216 am:
9e9987c46d am:
9583ca702a -s ours
am:
acf3c39437
Change-Id: Ibeb28073a468c0af7f76ea3c1976416c4c4fe84d
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:35 +0000 (23:50 +0000)]
Merge "MPEG4Extractor: ensure returned status is checked." into nyc-dev am:
02772b134e am:
2aa463e371 am:
4fa11b6cdf
am:
ae73886c4d
Change-Id: I14a582f7890104d20ed8ad2336feaaf640d60bec
Wei Jia [Fri, 14 Jul 2017 23:50:35 +0000 (23:50 +0000)]
Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into lmp-dev am:
61df326a5e -s ours am:
3092ed372c am:
74952e9616 -s ours
am:
162672a9f6
Change-Id: Ibb5582e0c402221d6af88592ef261aeaafaf5f10
Wei Jia [Fri, 14 Jul 2017 23:50:32 +0000 (23:50 +0000)]
Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into mnc-dev am:
80059d44c4 am:
72840f2216 am:
9e9987c46d
am:
9583ca702a -s ours
Change-Id: Id8e5cbdcc0a9212f519677cb291c71c8a0d3fba1
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:36 +0000 (23:42 +0000)]
Merge "MPEG4Extractor: ensure returned status is checked." into nyc-dev am:
02772b134e am:
2aa463e371
am:
4fa11b6cdf
Change-Id: I199b2ac4365044bd8e901cc349fcbbc04fb4b5b8
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:42:30 +0000 (23:42 +0000)]
Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into mnc-dev am:
80059d44c4 am:
72840f2216
am:
9e9987c46d
Change-Id: Id34116719e08a09de303d2fad907ce1072d0cb18
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 mnc-dev am:
80059d44c4
am:
72840f2216
Change-Id: I787c9a7bae1a0e5bf635ceb9ab3df59faea78f31
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:38:29 +0000 (23:38 +0000)]
Merge "MPEG4Extractor: ensure returned status is checked." into nyc-dev am:
02772b134e
am:
2aa463e371
Change-Id: Iba2670e0f394c1a8058008904d7cc4f01fe317a7
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:32 +0000 (23:34 +0000)]
Merge "MPEG4Extractor: ensure returned status is checked." into nyc-dev
am:
02772b134e
Change-Id: If99cab67ff6f06551da5b6202d7d36c2854ff3a9
Wei Jia [Fri, 14 Jul 2017 23:34:32 +0000 (23:34 +0000)]
Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into mnc-dev
am:
80059d44c4
Change-Id: I1d598f9f0bc506f2ea20b82d070ed69ec35876ee
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:27:21 +0000 (23:27 +0000)]
Merge "MPEG4Extractor: ensure returned status is checked." into nyc-dev
Wei Jia [Fri, 14 Jul 2017 23:26:43 +0000 (23:26 +0000)]
Merge "DO NOT MERGE: MPEG4Extractor: ensure returned status is checked." into mnc-dev
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
Tom Cherry [Thu, 13 Jul 2017 22:47:03 +0000 (22:47 +0000)]
remove extraneous `using namespace android` and deprecate utils/Log.h
am:
357552eb72
Change-Id: I36120c44e85c9ac35fb44e6f200b0f4341343b94
Tom Cherry [Wed, 12 Jul 2017 20:48:26 +0000 (13:48 -0700)]
remove extraneous `using namespace android` and deprecate utils/Log.h
This namespace is not used by this file and its declaration is removed
in a separate CL from utils/Log.h, which is the only place it is
defined, so we must remove this extraneous line.
Also, since that separate CL is deprecating utils/Log.h in favor of
log/log.h, we make the switch to the new header.
Test: Build
Exempt-From-Owner-Approval: Owners file needs updating
Change-Id: I34aa80765d30c79f8cb67eaf95a9995066bd672e
Yunlian Jiang [Wed, 12 Jul 2017 00:04:48 +0000 (00:04 +0000)]
Merge "Fix memory leak warning." am:
ae6088e456
am:
37cd5f116d
Change-Id: Ie4fb09cdd3fec819eb67563e251b927d4202de07
Yunlian Jiang [Wed, 12 Jul 2017 00:01:48 +0000 (00:01 +0000)]
Merge "Fix memory leak warning."
am:
ae6088e456
Change-Id: I3dff126ce299da44030ae92822f48e34e9693a55
Treehugger Robot [Tue, 11 Jul 2017 23:54:36 +0000 (23:54 +0000)]
Merge "Fix memory leak warning."
Ray Essick [Tue, 11 Jul 2017 02:22:52 +0000 (02:22 +0000)]
Merge "DO NOT MERGE Check frame handle validity before freeing buffer." into nyc-dev am:
ce2cdf02bd am:
c36cdf16a9 am:
389c6ede46 am:
fd175e7f88 am:
dce2faae4f -s ours
am:
747c025ebf
Change-Id: If12923a338c76a86a8781c28ab27a947c181c4fb
Eric Laurent [Tue, 11 Jul 2017 02:22:30 +0000 (02:22 +0000)]
Merge "audio effects: filter reserved effect commands" into klp-dev am:
f57dc8b72f am:
dc2efe3808 am:
4324bdc8f7 am:
acbb8e7dd1 am:
c6358fa910 am:
62948f53a2 am:
a9565fba8b am:
be01ebd598 am:
46da92fa8f am:
b1a72c8787 am:
db02180546 -s ours am:
880adb1f2e am:
56007baa97 am:
18162a5a35 am:
e8fa1a74ee
am:
0f2dde714c
Change-Id: I3856ef329f6177182b11a9eab104e679575a252c
Ray Essick [Tue, 11 Jul 2017 02:20:19 +0000 (02:20 +0000)]
Merge "DO NOT MERGE Check frame handle validity before freeing buffer." into nyc-dev am:
ce2cdf02bd am:
c36cdf16a9 am:
389c6ede46 am:
fd175e7f88
am:
dce2faae4f -s ours
Change-Id: I7e552a80892b02274c77066db556f0d7794847a0
Eric Laurent [Tue, 11 Jul 2017 02:20:02 +0000 (02:20 +0000)]
Merge "audio effects: filter reserved effect commands" into klp-dev am:
f57dc8b72f am:
dc2efe3808 am:
4324bdc8f7 am:
acbb8e7dd1 am:
c6358fa910 am:
62948f53a2 am:
a9565fba8b am:
be01ebd598 am:
46da92fa8f am:
b1a72c8787 am:
db02180546 -s ours am:
880adb1f2e am:
56007baa97 am:
18162a5a35
am:
e8fa1a74ee
Change-Id: I18b86f01373860b748528911f167cf84baaf7894
Ray Essick [Tue, 11 Jul 2017 02:17:51 +0000 (02:17 +0000)]
Merge "DO NOT MERGE Check frame handle validity before freeing buffer." into nyc-dev am:
ce2cdf02bd am:
c36cdf16a9 am:
389c6ede46
am:
fd175e7f88
Change-Id: Idcb4ef749ef42113a6f37ba4e3bf6b025581e5a6
Eric Laurent [Tue, 11 Jul 2017 02:17:30 +0000 (02:17 +0000)]
Merge "audio effects: filter reserved effect commands" into klp-dev am:
f57dc8b72f am:
dc2efe3808 am:
4324bdc8f7 am:
acbb8e7dd1 am:
c6358fa910 am:
62948f53a2 am:
a9565fba8b am:
be01ebd598 am:
46da92fa8f am:
b1a72c8787 am:
db02180546 -s ours am:
880adb1f2e am:
56007baa97
am:
18162a5a35
Change-Id: I4b0fb80d27a53941c99f49d672bac94ea7a81691
Ray Essick [Tue, 11 Jul 2017 02:15:16 +0000 (02:15 +0000)]
Merge "DO NOT MERGE Check frame handle validity before freeing buffer." into nyc-dev am:
ce2cdf02bd am:
c36cdf16a9
am:
389c6ede46
Change-Id: I17fe125bacb15f85706425c3267896a240073d94
Eric Laurent [Tue, 11 Jul 2017 02:14:56 +0000 (02:14 +0000)]
Merge "audio effects: filter reserved effect commands" into klp-dev am:
f57dc8b72f am:
dc2efe3808 am:
4324bdc8f7 am:
acbb8e7dd1 am:
c6358fa910 am:
62948f53a2 am:
a9565fba8b am:
be01ebd598 am:
46da92fa8f am:
b1a72c8787 am:
db02180546 -s ours am:
880adb1f2e
am:
56007baa97
Change-Id: Ibb9e25ac658b185c17d2e594c3cd69df4091ce5a
Ray Essick [Tue, 11 Jul 2017 02:12:48 +0000 (02:12 +0000)]
Merge "DO NOT MERGE Check frame handle validity before freeing buffer." into nyc-dev am:
ce2cdf02bd
am:
c36cdf16a9
Change-Id: I113d6d04f01f61be1e5837c13bf9d51731caab55
Eric Laurent [Tue, 11 Jul 2017 02:12:29 +0000 (02:12 +0000)]
Merge "audio effects: filter reserved effect commands" into klp-dev am:
f57dc8b72f am:
dc2efe3808 am:
4324bdc8f7 am:
acbb8e7dd1 am:
c6358fa910 am:
62948f53a2 am:
a9565fba8b am:
be01ebd598 am:
46da92fa8f am:
b1a72c8787 am:
db02180546 -s ours
am:
880adb1f2e
Change-Id: Ie26a5a8a2a2459feec0b44f1a0573c2170d0e303
Eric Laurent [Fri, 16 Jun 2017 01:43:46 +0000 (18:43 -0700)]
audio effects: filter reserved effect commands
Block effect commands reserved for framework use when
received on server side IAudioEffect. Applications have no reason
to use these commands and they present a unnecessary attack surface.
Bug:
62019992
Test: run CTS tests for audio effects
Change-Id: Ie680d5d5650f99dbabf93891703e1cde2c2e852d
Ray Essick [Tue, 11 Jul 2017 02:10:46 +0000 (02:10 +0000)]
Merge "DO NOT MERGE Check frame handle validity before freeing buffer." into nyc-dev
am:
ce2cdf02bd
Change-Id: I06aec170231079b7a5155d25974db2d356aab410
Eric Laurent [Tue, 11 Jul 2017 02:10:25 +0000 (02:10 +0000)]
Merge "audio effects: filter reserved effect commands" into klp-dev am:
f57dc8b72f am:
dc2efe3808 am:
4324bdc8f7 am:
acbb8e7dd1 am:
c6358fa910 am:
62948f53a2 am:
a9565fba8b am:
be01ebd598 am:
46da92fa8f am:
b1a72c8787
am:
db02180546 -s ours
Change-Id: Id1faed6d6b5fcb927f4f98b5ae0b37c8b0ab94a0