git.osdn.net Git - android-x86/frameworks-av.git/log

Chong Zhang [Tue, 18 Jul 2017 22:59:19 +0000 (22:59 +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 am: 2b1df0008a am: b38111a0db am: fb7c6d9173 am: ee1f46846d am: 8486817a65 am: 0ac0157213 am: a06a77509b
am: 24145427ed

Change-Id: I55ab577a8a2cee7d819439a0c6e04d88248523b9

commit | commitdiff | tree

Chong Zhang [Tue, 18 Jul 2017 22:56:46 +0000 (22:56 +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 am: 2b1df0008a am: b38111a0db am: fb7c6d9173 am: ee1f46846d am: 8486817a65 am: 0ac0157213
am: a06a77509b

Change-Id: Id4dda801e6a078d897c0c44dcd66231a2e6fc089

commit | commitdiff | tree

Chong Zhang [Tue, 18 Jul 2017 22:54:44 +0000 (22:54 +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 am: 2b1df0008a am: b38111a0db am: fb7c6d9173 am: ee1f46846d am: 8486817a65
am: 0ac0157213

Change-Id: I77a86457602647bd6eeeb16582497df3ab4274aa

commit | commitdiff | tree

Chong Zhang [Tue, 18 Jul 2017 22:52:48 +0000 (22:52 +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 am: 2b1df0008a am: b38111a0db am: fb7c6d9173 am: ee1f46846d
am: 8486817a65

Change-Id: I94eb3461b170d5695111ce12208713221e5ebb17

commit | commitdiff | tree

Chong Zhang [Tue, 18 Jul 2017 22:49:46 +0000 (22:49 +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 am: 2b1df0008a am: b38111a0db am: fb7c6d9173
am: ee1f46846d

Change-Id: I7c171b235bdb3349b43824616fedde741e626fde

commit | commitdiff | tree

Chong Zhang [Tue, 18 Jul 2017 22:47:44 +0000 (22:47 +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 am: 2b1df0008a am: b38111a0db
am: fb7c6d9173

Change-Id: Ib8172b10fb3e8df9310662555976cc93d90c87a4

commit | commitdiff | tree

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

commit | commitdiff | tree

Chong Zhang [Tue, 18 Jul 2017 22:45:47 +0000 (22:45 +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 am: 2b1df0008a
am: b38111a0db

Change-Id: Id28fc6a835b1e7abf7d84642cfe4a1e8cfe04edc

commit | commitdiff | tree

Chong Zhang [Tue, 18 Jul 2017 22:43:44 +0000 (22:43 +0000)]

commit | commitdiff | tree

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

commit | commitdiff | tree

Chong Zhang [Tue, 18 Jul 2017 22:41:13 +0000 (22:41 +0000)]

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

TreeHugger Robot [Sat, 15 Jul 2017 00:39:40 +0000 (00:39 +0000)]

Merge "audio effects: filter reserved effect commands" into nyc-mr1-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Wei Jia [Fri, 14 Jul 2017 23:58:32 +0000 (23:58 +0000)]

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Wei Jia [Fri, 14 Jul 2017 23:54:32 +0000 (23:54 +0000)]

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Wei Jia [Fri, 14 Jul 2017 23:27:21 +0000 (23:27 +0000)]

Merge "MPEG4Extractor: ensure returned status is checked." into nyc-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Chong Zhang [Mon, 10 Jul 2017 19:11:41 +0000 (12:11 -0700)]

stagefright: fix crash due to bad timestamp index

bug: 62872863
Change-Id: I7f8ae62173d8b4bef0d6c35166427871408ad9dd

commit | commitdiff | tree

TreeHugger Robot [Mon, 10 Jul 2017 20:47:14 +0000 (20:47 +0000)]

Merge "DO NOT MERGE Check frame handle validity before freeing buffer." into nyc-dev

commit | commitdiff | tree

Eric Laurent [Mon, 10 Jul 2017 20:38:06 +0000 (20:38 +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

Change-Id: I251baae005c3e276f409a754de251ce20a125e65

commit | commitdiff | tree

Eric Laurent [Mon, 10 Jul 2017 20:34:03 +0000 (20:34 +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

Change-Id: Iea5b777e88e42ffb60ccd517794f8a8fdd9c1f23

commit | commitdiff | tree

Eric Laurent [Mon, 10 Jul 2017 20:30:04 +0000 (20:30 +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

Change-Id: Id3aa2f4891fd79411edb719a6b6abd741d1110bc

commit | commitdiff | tree

Eric Laurent [Mon, 10 Jul 2017 20:26:36 +0000 (20:26 +0000)]

commit | commitdiff | tree

Eric Laurent [Mon, 10 Jul 2017 20:22:05 +0000 (20:22 +0000)]

Merge "audio effects: filter reserved effect commands" into klp-dev am: f57dc8b72f am: dc2efe3808 am: 4324bdc8f7 am: acbb8e7dd1 am: c6358fa910
am: 62948f53a2

Change-Id: Ia99ed9e04cf2d90ee3f201efd9f238fb06e3be88

commit | commitdiff | tree

Eric Laurent [Mon, 10 Jul 2017 20:17:34 +0000 (20:17 +0000)]

Merge "audio effects: filter reserved effect commands" into klp-dev am: f57dc8b72f am: dc2efe3808 am: 4324bdc8f7 am: acbb8e7dd1
am: c6358fa910

Change-Id: Ic8ebb5b01026b6762afb1ea7f2bc26f51f5d189e