50aa5be388
[DO NOT MERGE] Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels().
...
In the bug the SBR decoder has already set up 9 channels and tries to
allocate one more channel. The assignment of the QMF channels to SBR
channels fails since the QMF domain manages only 8+1 channels instead
of 10 channels as reqeusted by SBR.
Here we have added a check in sbrDecoder_InitElement() which will
return with a parse error in case additional SBR channels would exceed
the maximum number of SBR channels. This solves the potential heap
buffer overflow.
Bug: 158762825
Test: atest DecoderTestAacDrc DecoderTestXheAac
Change-Id: I741f49ab3b675fa3d3217ee72e1db66b0114f7ee
2020-07-06 21:42:07 +00:00
c1a75279a1
Improve code coverage for aac_dec_fuzzer
...
Test: ./aac_dec_fuzzer
Bug: 158206619
Change-Id: I42d57ec832dbd273f66ce149ce81bfcb1c514add
2020-06-19 10:57:18 +05:30
63d6409af1
Snap for 6544675 from ebc1030f65 to rvc-release
...
Change-Id: Icd0e65b905da537b43498b94b7e4d0424837c9d1
2020-05-30 23:08:39 +00:00
0ebbc9d336
point to new repo hooks for mainline uploads am: ebc1030f65 am: 251785c993 am: c2d9dc1ab3 am: e445fffa0c
...
Change-Id: Ib427f17ee4811e85097fc8ae3f68d7f0fab5f1d4
2020-05-30 00:32:01 +00:00
b52b41c8a0
Merge "point to new repo hooks for mainline uploads am: ebc1030f65 am: ecae3c24b3 am: da694cd595" into rvc-qpr-dev-plus-aosp am: 03f1989345
...
Change-Id: I3822acb22064ecf6a0b3efdb63e7b4fea6ddbf7a
2020-05-30 00:31:30 +00:00
611815c6fe
point to new repo hooks for mainline uploads am: ebc1030f65 am: ecae3c24b3 am: eeb1d2d3cf am: c329ddd2d9
...
Change-Id: I3f6c5f1f3066d366af0ee925a31edff92edb3e8b
2020-05-30 00:30:13 +00:00
e445fffa0c
point to new repo hooks for mainline uploads am: ebc1030f65 am: 251785c993 am: c2d9dc1ab3
...
Change-Id: I69a934cab36df4088a1a53f9a9e5d171b4bbb7e9
2020-05-30 00:17:16 +00:00
03f1989345
Merge "point to new repo hooks for mainline uploads am: ebc1030f65 am: ecae3c24b3 am: da694cd595" into rvc-qpr-dev-plus-aosp
2020-05-30 00:16:39 +00:00
f3944443a0
point to new repo hooks for mainline uploads am: ebc1030f65 am: ecae3c24b3 am: da694cd595
...
Change-Id: If139bccabcd71a6c529e234d23ad454b061ae36c
2020-05-30 00:16:25 +00:00
c329ddd2d9
point to new repo hooks for mainline uploads am: ebc1030f65 am: ecae3c24b3 am: eeb1d2d3cf
...
Change-Id: I1c4df033663d308ae24bc42d723ddf09f05b9de9
2020-05-30 00:16:12 +00:00
c2d9dc1ab3
point to new repo hooks for mainline uploads am: ebc1030f65 am: 251785c993
...
Change-Id: I61510ab3a0a69acb70875ea8e3163fa7debcb18c
2020-05-30 00:03:25 +00:00
eeb1d2d3cf
point to new repo hooks for mainline uploads am: ebc1030f65 am: ecae3c24b3
...
Change-Id: I4af7365b2f0e59ecd52df4022faf4f7798932d7a
2020-05-30 00:03:07 +00:00
da694cd595
point to new repo hooks for mainline uploads am: ebc1030f65 am: ecae3c24b3
...
Change-Id: I04a039fe95ed1bdb9957a562cdfdb125c59ad090
2020-05-30 00:03:06 +00:00
3f829aa0e1
point to new repo hooks for mainline uploads am: ebc1030f65
...
Change-Id: I4a628b1146f9e9cc4cbbfeb3a5b1b4aba0fd8ce3
2020-05-29 23:49:48 +00:00
251785c993
point to new repo hooks for mainline uploads am: ebc1030f65
...
Change-Id: Ibaae6c3cebad3d20b19447824bc5433601081968
2020-05-29 23:49:26 +00:00
ecae3c24b3
point to new repo hooks for mainline uploads am: ebc1030f65
...
Change-Id: I2f08b01ee76f7524fb041d8541847eb9b4832f14
2020-05-29 23:49:24 +00:00
ebc1030f65
point to new repo hooks for mainline uploads
...
Bug: 157501573
Test: upload
Change-Id: I0e4764db6516d17a81dc5a31bf9d9427b2c570d6
2020-05-26 16:29:58 -07:00
979a438f4b
Merge "Fix license type s/b BY_EXCEPTION_ONLY" am: 86bd192796 am: e76ca4d9ac am: 6d5490018a am: 6313f8703e am: f4248aadbf
...
Change-Id: Id629dd1319314e4964768b1dfa344273d6bde4eb
2020-05-21 23:29:37 +00:00
f4248aadbf
Merge "Fix license type s/b BY_EXCEPTION_ONLY" am: 86bd192796 am: e76ca4d9ac am: 6d5490018a am: 6313f8703e
...
Change-Id: I0471f66a21267ba4059976e491d0489a74ba34a7
2020-05-21 23:16:09 +00:00
6313f8703e
Merge "Fix license type s/b BY_EXCEPTION_ONLY" am: 86bd192796 am: e76ca4d9ac am: 6d5490018a
...
Change-Id: I7b5c175a03532581aac39584dcd308eca401642a
2020-05-21 22:55:18 +00:00
6d5490018a
Merge "Fix license type s/b BY_EXCEPTION_ONLY" am: 86bd192796 am: e76ca4d9ac
...
Change-Id: Ia1d49e25596031c732021bccb2a86a03f3ad874c
2020-05-21 22:41:14 +00:00
e76ca4d9ac
Merge "Fix license type s/b BY_EXCEPTION_ONLY" am: 86bd192796
...
Change-Id: If0646e3c2b9b9927a58811606fff28e432e6d303
2020-05-21 22:28:36 +00:00
86bd192796
Merge "Fix license type s/b BY_EXCEPTION_ONLY"
2020-05-21 22:16:18 +00:00
7a5f7b83ce
Merge "Added fuzz_config field in aac_dec_fuzzer" am: 43fb529e06 am: f96c6f3a30 am: f60530f491 am: 194e249990 am: 248c3a9e0a
...
Change-Id: I2d7833e7fc8964baa35792f57cec6d0137dc3f20
2020-05-21 21:36:12 +00:00
248c3a9e0a
Merge "Added fuzz_config field in aac_dec_fuzzer" am: 43fb529e06 am: f96c6f3a30 am: f60530f491 am: 194e249990
...
Change-Id: Ib567b1aeb584a8f820a455222322ece0686a5903
2020-05-21 20:55:53 +00:00
194e249990
Merge "Added fuzz_config field in aac_dec_fuzzer" am: 43fb529e06 am: f96c6f3a30 am: f60530f491
...
Change-Id: I20727c08423682ca8c6d3fcfa680423375c02156
2020-05-21 20:35:45 +00:00
f60530f491
Merge "Added fuzz_config field in aac_dec_fuzzer" am: 43fb529e06 am: f96c6f3a30
...
Change-Id: I4104bd7b4964dbd270cb614a164d426ecd24e0bf
2020-05-21 20:10:40 +00:00
f96c6f3a30
Merge "Added fuzz_config field in aac_dec_fuzzer" am: 43fb529e06
...
Change-Id: I9cc973e862cfa58047cd1056488f64de4bf07abb
2020-05-21 19:54:30 +00:00
92c9b7ea9a
Fix license type s/b BY_EXCEPTION_ONLY
...
The Fraunhofer license has special requirements.
Test: no code change
Change-Id: I439354498c0a28d6ff078cea9a4f8e9bfc02145f
2020-05-21 12:49:18 -07:00
43fb529e06
Merge "Added fuzz_config field in aac_dec_fuzzer"
2020-05-21 19:37:30 +00:00
64e4f25b29
Added fuzz_config field in aac_dec_fuzzer
...
Test: ./aac_dec_fuzzer
Bug: 156871294
Change-Id: Idfc93a6f6c71a78c2b7759443161d8e75dfc4670
2020-05-19 11:59:34 +05:30
d0f1ac8a7b
Snap for 6484097 from 71c477bae4 to rvc-release
...
Change-Id: I4db69c7d577a0fde24cf10c01302118be83a29cd
2020-05-12 01:13:03 +00:00
0384bc0c82
[automerger skipped] Set min_sdk_version to be part of mainline modules am: 71c477bae4 am: b6b6120ac8 am: c658b5ab4b -s ours am: 3566a11cc1 -s ours
...
am skip reason: Change-Id I662ad951a3221f967b53e7af65cb203a4b4a5e5d with SHA-1 71c477bae4
2020-05-11 09:10:03 +00:00
d2c6a8fdf0
[automerger skipped] Set min_sdk_version to be part of mainline modules am: 71c477bae4 -s ours am: d4b4152be0 -s ours am: d6b557a3b2 -s ours am: 7ab81f83ab -s ours
...
am skip reason: Change-Id I662ad951a3221f967b53e7af65cb203a4b4a5e5d with SHA-1 71c477bae4
2020-05-11 09:09:56 +00:00
b653d97620
[automerger skipped] Set min_sdk_version to be part of mainline modules am: 71c477bae4 am: b6b6120ac8 -s ours am: fcd9348524 -s ours am: 54b2057032 -s ours
...
am skip reason: Change-Id I662ad951a3221f967b53e7af65cb203a4b4a5e5d with SHA-1 d40f05a618
2020-05-11 09:09:42 +00:00
3566a11cc1
[automerger skipped] Set min_sdk_version to be part of mainline modules am: 71c477bae4 am: b6b6120ac8 am: c658b5ab4b -s ours
...
am skip reason: Change-Id I662ad951a3221f967b53e7af65cb203a4b4a5e5d with SHA-1 71c477bae4
2020-05-11 08:52:50 +00:00
7ab81f83ab
[automerger skipped] Set min_sdk_version to be part of mainline modules am: 71c477bae4 -s ours am: d4b4152be0 -s ours am: d6b557a3b2 -s ours
...
am skip reason: Change-Id I662ad951a3221f967b53e7af65cb203a4b4a5e5d with SHA-1 71c477bae4
2020-05-11 08:52:40 +00:00
54b2057032
[automerger skipped] Set min_sdk_version to be part of mainline modules am: 71c477bae4 am: b6b6120ac8 -s ours am: fcd9348524 -s ours
...
am skip reason: Change-Id I662ad951a3221f967b53e7af65cb203a4b4a5e5d with SHA-1 d40f05a618
2020-05-11 08:52:32 +00:00
c658b5ab4b
Set min_sdk_version to be part of mainline modules am: 71c477bae4 am: b6b6120ac8
...
Change-Id: I81dccfd0a9790f4251f88ab9c14ca1827d72e388
2020-05-11 08:41:27 +00:00
d6b557a3b2
[automerger skipped] Set min_sdk_version to be part of mainline modules am: 71c477bae4 -s ours am: d4b4152be0 -s ours
...
am skip reason: Change-Id I662ad951a3221f967b53e7af65cb203a4b4a5e5d with SHA-1 71c477bae4
2020-05-11 08:41:19 +00:00
fcd9348524
[automerger skipped] Set min_sdk_version to be part of mainline modules am: 71c477bae4 am: b6b6120ac8 -s ours
...
am skip reason: Change-Id I662ad951a3221f967b53e7af65cb203a4b4a5e5d with SHA-1 d40f05a618
2020-05-11 08:41:06 +00:00
fbd4db0365
Set min_sdk_version to be part of mainline modules am: 71c477bae4
...
Change-Id: I2fce92c77e6583c6662636a66e8a0e85c9fbbec4
2020-05-11 08:21:35 +00:00
d4b4152be0
[automerger skipped] Set min_sdk_version to be part of mainline modules am: 71c477bae4 -s ours
...
am skip reason: Change-Id I662ad951a3221f967b53e7af65cb203a4b4a5e5d with SHA-1 d40f05a618
2020-05-11 08:21:30 +00:00
b6b6120ac8
Set min_sdk_version to be part of mainline modules am: 71c477bae4
...
Change-Id: Iab6ac89228254383926bcb569f8e211920e24650
2020-05-11 08:21:16 +00:00
71c477bae4
Set min_sdk_version to be part of mainline modules
...
Modules contributing mainline modules (APK/APEX) should set
min_sdk_version as well as apex_available.
For now setting min_sdk_version doesn't change build outputs.
But build-time checks will be added soon.
Exempt-From-Owner-Approval: cherry-pick from aosp
Bug: 152655956
Test: m
Merged-In: I662ad951a3221f967b53e7af65cb203a4b4a5e5d
Change-Id: I662ad951a3221f967b53e7af65cb203a4b4a5e5d
(cherry picked from commit d40f05a618
2020-05-11 07:01:25 +00:00
783443cfea
Merge "Add METADATA to aac: Apache2=NOTICE" am: 49a9939e4a am: 1f88875235 am: 33de11d223 am: 81352d07d7 am: 5521ad4a2c
...
Change-Id: I442edd332271b12d4cb2454eedc00b63df1a46f9
2020-05-04 20:22:11 +00:00
5521ad4a2c
Merge "Add METADATA to aac: Apache2=NOTICE" am: 49a9939e4a am: 1f88875235 am: 33de11d223 am: 81352d07d7
...
Change-Id: Ide2d89ea0e75e14127cf46c3bb9f5137ca237a3d
2020-05-04 20:07:46 +00:00
81352d07d7
Merge "Add METADATA to aac: Apache2=NOTICE" am: 49a9939e4a am: 1f88875235 am: 33de11d223
...
Change-Id: I4960f573cd714dbdb1c20327f383cb45c983170b
2020-05-04 19:46:21 +00:00
33de11d223
Merge "Add METADATA to aac: Apache2=NOTICE" am: 49a9939e4a am: 1f88875235
...
Change-Id: If7805235d362630a3cd22e16d5d7a52bfae10157
2020-05-04 19:33:36 +00:00
1f88875235
Merge "Add METADATA to aac: Apache2=NOTICE" am: 49a9939e4a
...
Change-Id: Ie009da3fed10417d87afd65c4097d8ac58954ec6
2020-05-04 19:19:30 +00:00
Fraunhofer IIS FDK
S Vasudev Prasad
android-build-team Robot
Ray Essick
Automerger Merge Worker
Treehugger Robot
Kris Alder
Bob Badour
Ayushi Khopkar
Jooyung Han