Commit Graph

431 Commits

Author SHA1 Message Date
android-build-team Robot b0bd68ec62 Snap for 4585119 from 6288a1e34c to pi-release
Change-Id: Id4fc531cb7dc898e8ebe483c5f201bd8f3c86788
2018-02-05 08:21:12 +00:00
Android Build Merger (Role) 6288a1e34c [automerger skipped] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info skipped: 8b0edf42a0 am: fed4ae1115 am: 45ca1d7199 am: 31fac02b0e
am: 29870460c6  -s ours

Change-Id: Ifb2b9cb8ef0a7311d11c22aa9e3eab9b7511705c
2018-02-02 14:56:03 +00:00
Android Build Merger (Role) bdea4742b7 [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: e2fb9f0ac6 am: 4b684c6690 skipped: 000fe3d02d am: dcbb54a6ec am: 67e9a995ce am: fec52a666d
am: 88d43f631a  -s ours

Change-Id: Idf901fae7d4b3a6ebfdf43c4a078ea81635b44de
2018-02-02 14:55:56 +00:00
Android Build Merger (Role) d8828f3450 [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 31447431fe am: fce9663d6f am: 658a02f977 am: 243be669b3 skipped: c2fe4b944b am: c54946e671 am: f1a2354a3a am: d6b29883ff
am: 1ce9a79b52  -s ours

Change-Id: I1ef94896496b3ebe14a7befed9d80de95de636aa
2018-02-02 14:55:49 +00:00
Android Build Merger (Role) 315bfca5c1 [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: dc880988f0 am: 64b670e10a skipped: 43323dd03f am: e78aa83b8f am: 5944cdf5b0 am: 0a9ef8a138 am: 601d27b59d skipped: 2494f9fa12 am: bae005cba3 am: b81d554ba6 am: fa62928801
am: 53daa4e90c  -s ours

Change-Id: I216f295d4fc0ef52f763e1fd8b93da2080c8f572
2018-02-02 14:55:41 +00:00
Android Build Merger (Role) 3be49fd8fe [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 08ae2e8d12 am: 99f3e5ce05 am: c48482d937 skipped: 81ea4ba91d am: 46ead43c76 am: 0bbb81398c am: bd4b66c1a9 am: 464c4336ad skipped: 233344c45c am: bb38f901b4 am: e12ed0c4fb am: 27e0af2ad1
am: 9ab6f29ae0  -s ours

Change-Id: I79afffd974b455d192aa1259514ac8c0d8f48202
2018-02-02 14:55:34 +00:00
Jean-Michel Trivi 9f487b9566 Merge changes from topic "am-33ca3d69-2b65-4c99-8266-49b4f5c3c1c9" into oc-dev am: 378e6c244a am: 991036b9f8 am: 78b29903f9
am: a6034001a4

Change-Id: I7902e224bb04f044c52323c55054503d15069610
2018-02-02 14:55:25 +00:00
Android Build Merger (Role) 29870460c6 [automerger skipped] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info skipped: 8b0edf42a0 am: fed4ae1115 am: 45ca1d7199
am: 31fac02b0e

Change-Id: Id4466d91efbbbea558c16463fa42c77ff157c519
2018-02-02 06:59:34 +00:00
Android Build Merger (Role) 88d43f631a [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: e2fb9f0ac6 am: 4b684c6690 skipped: 000fe3d02d am: dcbb54a6ec am: 67e9a995ce
am: fec52a666d

Change-Id: I86182e0f6471b424c5ff47d109986a2c27834f89
2018-02-02 06:59:24 +00:00
Android Build Merger (Role) 1ce9a79b52 [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 31447431fe am: fce9663d6f am: 658a02f977 am: 243be669b3 skipped: c2fe4b944b am: c54946e671 am: f1a2354a3a
am: d6b29883ff

Change-Id: I1432c9e013fae8ec830ea44d094d63174dde4785
2018-02-02 06:59:12 +00:00
Android Build Merger (Role) 53daa4e90c [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: dc880988f0 am: 64b670e10a skipped: 43323dd03f am: e78aa83b8f am: 5944cdf5b0 am: 0a9ef8a138 am: 601d27b59d skipped: 2494f9fa12 am: bae005cba3 am: b81d554ba6
am: fa62928801

Change-Id: Idc3d03203794c4307c0fcfdd20e052540eaa9a34
2018-02-02 06:59:02 +00:00
Android Build Merger (Role) 9ab6f29ae0 [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 08ae2e8d12 am: 99f3e5ce05 am: c48482d937 skipped: 81ea4ba91d am: 46ead43c76 am: 0bbb81398c am: bd4b66c1a9 am: 464c4336ad skipped: 233344c45c am: bb38f901b4 am: e12ed0c4fb
am: 27e0af2ad1

Change-Id: I9f2226babdca9c21003e743e920fe994483e3b40
2018-02-02 06:58:49 +00:00
Jean-Michel Trivi a6034001a4 Merge changes from topic "am-33ca3d69-2b65-4c99-8266-49b4f5c3c1c9" into oc-dev am: 378e6c244a am: 991036b9f8
am: 78b29903f9

Change-Id: I264187a911014bbb8d0a4420ac4a25f4057f78dc
2018-02-02 06:58:37 +00:00
Android Build Merger (Role) 31fac02b0e [automerger skipped] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info skipped: 8b0edf42a0 am: fed4ae1115
am: 45ca1d7199

Change-Id: Ic4a9ac130a9410a7f2bc6a094aba0c0d0085b7b8
2018-02-02 03:42:36 +00:00
Android Build Merger (Role) fec52a666d [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: e2fb9f0ac6 am: 4b684c6690 skipped: 000fe3d02d am: dcbb54a6ec
am: 67e9a995ce

Change-Id: I43b81c7a7f8e1fbe4143b0262eaad72d3286f8da
2018-02-02 03:42:12 +00:00
Android Build Merger (Role) d6b29883ff [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 31447431fe am: fce9663d6f am: 658a02f977 am: 243be669b3 skipped: c2fe4b944b am: c54946e671
am: f1a2354a3a

Change-Id: I744d3ea898571c5d58329b495f8fc1e9e9cfb730
2018-02-02 03:41:44 +00:00
Android Build Merger (Role) fa62928801 [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: dc880988f0 am: 64b670e10a skipped: 43323dd03f am: e78aa83b8f am: 5944cdf5b0 am: 0a9ef8a138 am: 601d27b59d skipped: 2494f9fa12 am: bae005cba3
am: b81d554ba6

Change-Id: I580587d87c826a2abbc8284fcb787c1f5ce57e4b
2018-02-02 03:41:20 +00:00
Android Build Merger (Role) 27e0af2ad1 [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 08ae2e8d12 am: 99f3e5ce05 am: c48482d937 skipped: 81ea4ba91d am: 46ead43c76 am: 0bbb81398c am: bd4b66c1a9 am: 464c4336ad skipped: 233344c45c am: bb38f901b4
am: e12ed0c4fb

Change-Id: I0b14be2ff82aa5a67bd43398f96c1bc5699ca376
2018-02-02 03:41:01 +00:00
Jean-Michel Trivi 78b29903f9 Merge changes from topic "am-33ca3d69-2b65-4c99-8266-49b4f5c3c1c9" into oc-dev am: 378e6c244a
am: 991036b9f8

Change-Id: I7254dbe5cb685ea86b632dcbf670dea8a0671bf9
2018-02-02 03:40:35 +00:00
Android Build Merger (Role) 45ca1d7199 [automerger skipped] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info skipped: 8b0edf42a0
am: fed4ae1115

Change-Id: I3bb2c6e954a5d5212c976a1f6e1549a62352423a
2018-02-01 23:40:17 +00:00
Android Build Merger (Role) 67e9a995ce [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: e2fb9f0ac6 am: 4b684c6690 skipped: 000fe3d02d
am: dcbb54a6ec

Change-Id: I86083377cbd5c4c982d5686e22f620ff288abed2
2018-02-01 23:40:09 +00:00
Android Build Merger (Role) f1a2354a3a [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 31447431fe am: fce9663d6f am: 658a02f977 am: 243be669b3 skipped: c2fe4b944b
am: c54946e671

Change-Id: I888519abe97d8fa1cfdd754b0aa7f74d91b07c54
2018-02-01 23:40:00 +00:00
Android Build Merger (Role) b81d554ba6 [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: dc880988f0 am: 64b670e10a skipped: 43323dd03f am: e78aa83b8f am: 5944cdf5b0 am: 0a9ef8a138 am: 601d27b59d skipped: 2494f9fa12
am: bae005cba3

Change-Id: Ib40b2afd08360c07103d756536b54e26adbf56d8
2018-02-01 23:39:52 +00:00
Android Build Merger (Role) e12ed0c4fb [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 08ae2e8d12 am: 99f3e5ce05 am: c48482d937 skipped: 81ea4ba91d am: 46ead43c76 am: 0bbb81398c am: bd4b66c1a9 am: 464c4336ad skipped: 233344c45c
am: bb38f901b4

Change-Id: I6faf7e4a0bbb8ed6a11cd77dbe749c8e6bf59ade
2018-02-01 23:39:44 +00:00
Jean-Michel Trivi 991036b9f8 Merge changes from topic "am-33ca3d69-2b65-4c99-8266-49b4f5c3c1c9" into oc-dev
am: 378e6c244a

Change-Id: I0cb3e214777a0ed27cd21e9008e379a5af0b5be7
2018-02-01 23:39:34 +00:00
Android Build Merger (Role) fed4ae1115 [automerger skipped] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info skipped: 8b0edf42a0
Change-Id: Iff1ecd457b2b5dd89eef3d212ba06c52e37475c5
2018-02-01 18:07:10 +00:00
Jean-Michel Trivi 8b0edf42a0 DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info
In CProgramConfig_ReadHeightExt prevent stack overflow
 from invalid FrontElementHeightInfo array value.

Bug: 70637599
Test: see bug
Change-Id: I145414d81d7a7be711672c12f44b537c12eea308
2018-02-01 18:06:39 +00:00
Android Build Merger (Role) dcbb54a6ec [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: e2fb9f0ac6 am: 4b684c6690 skipped: 000fe3d02d
Change-Id: I053bbc39b92045c9be0c935bef8c078a41ce7fe8
2018-02-01 18:05:36 +00:00
Android Build Merger (Role) 000fe3d02d [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: e2fb9f0ac6 am: 4b684c6690
Change-Id: I790115ee7682dad92c72b03ef72711dd81cce45b
2018-02-01 18:05:35 +00:00
Android Build Merger (Role) 4b684c6690 [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: e2fb9f0ac6
Change-Id: Ib21720682d336b3250cc83699124af5895a12cc3
2018-02-01 18:05:34 +00:00
Jean-Michel Trivi e2fb9f0ac6 DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info
In CProgramConfig_ReadHeightExt prevent stack overflow
 from invalid FrontElementHeightInfo array value.

Bug: 70637599
Test: see bug
Change-Id: I145414d81d7a7be711672c12f44b537c12eea308
2018-02-01 18:05:24 +00:00
Android Build Merger (Role) c54946e671 [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 31447431fe am: fce9663d6f am: 658a02f977 am: 243be669b3 skipped: c2fe4b944b
Change-Id: I0a7ee9e92621704af6bdc7294ce375e8462e9065
2018-02-01 18:00:20 +00:00
Android Build Merger (Role) c2fe4b944b [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 31447431fe am: fce9663d6f am: 658a02f977 am: 243be669b3
Change-Id: Ia27f928400ceed95b6704b7b602968dbc14714e4
2018-02-01 18:00:19 +00:00
Android Build Merger (Role) 243be669b3 [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 31447431fe am: fce9663d6f am: 658a02f977
Change-Id: Ia94aa4643972ef0d09045546b4af093153772642
2018-02-01 18:00:18 +00:00
Android Build Merger (Role) 658a02f977 [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 31447431fe am: fce9663d6f
Change-Id: Ice80a96b140e09ffe1ac65b36f4441e14a1b7950
2018-02-01 18:00:17 +00:00
Android Build Merger (Role) fce9663d6f [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 31447431fe
Change-Id: I6fe14a13927084b6c3e7386936b17e52dc308755
2018-02-01 18:00:16 +00:00
Jean-Michel Trivi 31447431fe DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info
In CProgramConfig_ReadHeightExt prevent stack overflow
 from invalid FrontElementHeightInfo array value.

Bug: 70637599
Test: see bug
Change-Id: I145414d81d7a7be711672c12f44b537c12eea308
2018-02-01 18:00:13 +00:00
Android Build Merger (Role) bae005cba3 [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: dc880988f0 am: 64b670e10a skipped: 43323dd03f am: e78aa83b8f am: 5944cdf5b0 am: 0a9ef8a138 am: 601d27b59d skipped: 2494f9fa12
Change-Id: I2f20d89b7ef44751a99876ee0d6fb6fbb57df848
2018-02-01 17:58:56 +00:00
Android Build Merger (Role) 2494f9fa12 [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: dc880988f0 am: 64b670e10a skipped: 43323dd03f am: e78aa83b8f am: 5944cdf5b0 am: 0a9ef8a138 am: 601d27b59d
Change-Id: I5997bd762037c34a710a8f208551f25ea792972c
2018-02-01 17:58:55 +00:00
Android Build Merger (Role) 601d27b59d [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: dc880988f0 am: 64b670e10a skipped: 43323dd03f am: e78aa83b8f am: 5944cdf5b0 am: 0a9ef8a138
Change-Id: I2d04b1aaeb91d3e5d63659d30b07bf5831072da1
2018-02-01 17:58:54 +00:00
Android Build Merger (Role) 0a9ef8a138 [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: dc880988f0 am: 64b670e10a skipped: 43323dd03f am: e78aa83b8f am: 5944cdf5b0
Change-Id: Ia8958d29392426f83d946cb3050f738f5182db96
2018-02-01 17:58:53 +00:00
Android Build Merger (Role) 5944cdf5b0 [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: dc880988f0 am: 64b670e10a skipped: 43323dd03f am: e78aa83b8f
Change-Id: I8aa7bbac0c2910746f7de8f0949358ae56a4d7dc
2018-02-01 17:58:51 +00:00
Android Build Merger (Role) e78aa83b8f [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: dc880988f0 am: 64b670e10a skipped: 43323dd03f
Change-Id: I982f6f797485143c0a8379f1a904498fa3564e8c
2018-02-01 17:58:50 +00:00
Android Build Merger (Role) 43323dd03f [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: dc880988f0 am: 64b670e10a
Change-Id: If3b0d271ec214b0ec04f33639f9276d591665e36
2018-02-01 17:58:49 +00:00
Android Build Merger (Role) 64b670e10a [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: dc880988f0
Change-Id: Id25465c6c5697a53b41ab5ceeb5a4ad68b6ddcb9
2018-02-01 17:58:48 +00:00
Jean-Michel Trivi dc880988f0 DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info
In CProgramConfig_ReadHeightExt prevent stack overflow
 from invalid FrontElementHeightInfo array value.

Bug: 70637599
Test: see bug
Change-Id: I145414d81d7a7be711672c12f44b537c12eea308
2018-02-01 17:58:42 +00:00
Android Build Merger (Role) bb38f901b4 [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 08ae2e8d12 am: 99f3e5ce05 am: c48482d937 skipped: 81ea4ba91d am: 46ead43c76 am: 0bbb81398c am: bd4b66c1a9 am: 464c4336ad skipped: 233344c45c
Change-Id: I436c96743da8a703d0828ff33e955ea0e0ff3766
2018-02-01 17:30:10 +00:00
Android Build Merger (Role) 233344c45c [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 08ae2e8d12 am: 99f3e5ce05 am: c48482d937 skipped: 81ea4ba91d am: 46ead43c76 am: 0bbb81398c am: bd4b66c1a9 am: 464c4336ad
Change-Id: I07f7c08f0864cb673c9c8ebc98a58d3a5414ee62
2018-02-01 17:30:09 +00:00
Android Build Merger (Role) 464c4336ad [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 08ae2e8d12 am: 99f3e5ce05 am: c48482d937 skipped: 81ea4ba91d am: 46ead43c76 am: 0bbb81398c am: bd4b66c1a9
Change-Id: I36f8ec554ac96cdef4669809c8923b4f8b56768b
2018-02-01 17:30:08 +00:00
Android Build Merger (Role) bd4b66c1a9 [automerger] DO NOT MERGE MPEG-4 AAC Decoder: check against invalid height info am: 08ae2e8d12 am: 99f3e5ce05 am: c48482d937 skipped: 81ea4ba91d am: 46ead43c76 am: 0bbb81398c
Change-Id: Ibed017aec202e84aade79f805866c7102bdffa03
2018-02-01 17:30:07 +00:00