Rajat Kumar
38dd720c69
Fix for Null-dereference read in ixheaacd_init_sbr am: a741e1d5de am: 154faafaa9 am: 969c6ce482 am: 21a96efe69 am: 73a0c8e399
...
Original change: 1425114
2020-09-12 07:00:34 +00:00
Rajat Kumar
73a0c8e399
Fix for Null-dereference read in ixheaacd_init_sbr am: a741e1d5de am: 154faafaa9 am: 969c6ce482 am: 21a96efe69
...
Original change: 1425114
2020-09-12 06:23:04 +00:00
Rajat Kumar
21a96efe69
Fix for Null-dereference read in ixheaacd_init_sbr am: a741e1d5de am: 154faafaa9 am: 969c6ce482
...
Original change: 1425114
2020-09-12 05:46:28 +00:00
Rajat Kumar
969c6ce482
Fix for Null-dereference read in ixheaacd_init_sbr am: a741e1d5de am: 154faafaa9
...
Original change: 1425114
2020-09-12 05:10:06 +00:00
Rajat Kumar
154faafaa9
Fix for Null-dereference read in ixheaacd_init_sbr am: a741e1d5de
...
Original change: 1425114
2020-09-12 04:40:32 +00:00
Rajat Kumar
5bcf81b549
[automerger skipped] Fix to handle missing checks on error returned am: bcbd383251 am: f98b3e9ee5 am: 9ef235ec07 am: 0ca3b0b8f6 am: aaac00c094 -s ours
...
am skip reason: Change-Id Iea7bb9959fffd7a0e4f345f86581a1328e04a38e with SHA-1 d198c6af561425108
2020-09-11 23:57:51 +00:00
Xin Li
6e28c63450
[automerger skipped] Merge Android R am: 26fedcbb46 -s ours am: e48e13f994 -s ours am: f54123577f -s ours am: eb8e4080e8 -s ours am: 26e171ffe3 -s ours
...
am skip reason: Change-Id Ice88af6abbaec9ae277a56fcf7df516ba2e9486f with SHA-1 924a4628e01422379
2020-09-11 21:27:28 +00:00
Rajat Kumar
a741e1d5de
Fix for Null-dereference read in ixheaacd_init_sbr
...
Header decode is done with AOT 2 (AAC-LC profile),
but due to corrupted nature of input file AOT is read
as 42 (USAC profile) after few memory/table initializations.
As fix, modified the check to prevent an attempt
to change AOT in mid file.
Bug: 160389683
Test: poc in bug
Change-Id: Id95aa74b0833321b29b602d97b14c5a5580ef7fc
2020-09-11 21:41:49 +05:30
Rajat Kumar
aaac00c094
Fix to handle missing checks on error returned am: bcbd383251 am: f98b3e9ee5 am: 9ef235ec07 am: 0ca3b0b8f6
...
Original change: 1425108
2020-09-11 04:53:09 +00:00
Xin Li
26e171ffe3
[automerger skipped] Merge Android R am: 26fedcbb46 -s ours am: e48e13f994 -s ours am: f54123577f -s ours am: eb8e4080e8 -s ours
...
am skip reason: Change-Id Ice88af6abbaec9ae277a56fcf7df516ba2e9486f with SHA-1 924a4628e01422379
2020-09-11 03:58:59 +00:00
Rajat Kumar
0ca3b0b8f6
Fix to handle missing checks on error returned am: bcbd383251 am: f98b3e9ee5 am: 9ef235ec07
...
Original change: 1425108
2020-09-11 03:53:02 +00:00
Xin Li
eb8e4080e8
[automerger skipped] Merge Android R am: 26fedcbb46 -s ours am: e48e13f994 -s ours am: f54123577f -s ours
...
am skip reason: Change-Id Ice88af6abbaec9ae277a56fcf7df516ba2e9486f with SHA-1 924a4628e01422379
2020-09-11 03:33:28 +00:00
Rajat Kumar
9ef235ec07
Fix to handle missing checks on error returned am: bcbd383251 am: f98b3e9ee5
...
Original change: 1425108
2020-09-11 02:14:44 +00:00
Xin Li
f54123577f
[automerger skipped] Merge Android R am: 26fedcbb46 -s ours am: e48e13f994 -s ours
...
am skip reason: Change-Id Ice88af6abbaec9ae277a56fcf7df516ba2e9486f with SHA-1 924a4628e01422379
2020-09-11 02:02:37 +00:00
Rajat Kumar
f98b3e9ee5
Fix to handle missing checks on error returned am: bcbd383251
...
Original change: 1425108
2020-09-11 00:56:43 +00:00
Xin Li
e48e13f994
[automerger skipped] Merge Android R am: 26fedcbb46 -s ours
...
am skip reason: Change-Id Ice88af6abbaec9ae277a56fcf7df516ba2e9486f with SHA-1 924a4628e01422379
2020-09-11 00:40:06 +00:00
Rajat Kumar
bcbd383251
Fix to handle missing checks on error returned
...
Added missing return checks and converted
functions to void which doesn't return anything
other than zero.
Test: Review
Test: atest android.media.cts.DecoderTest
Bug:131183694
Change-Id: Iea7bb9959fffd7a0e4f345f86581a1328e04a38e
Merged-In: Iea7bb9959fffd7a0e4f345f86581a1328e04a38e
2020-09-10 12:48:42 -07:00
Xin Li
26fedcbb46
Merge Android R
...
Bug: 168057903
Merged-In: Ice88af6abbaec9ae277a56fcf7df516ba2e9486f
Change-Id: Id25da2bf82cd73fddf16c439f775d8f085ebec30
2020-09-08 16:54:39 -07:00
Xin Li
51aed09447
[automerger skipped] Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master am: 386b47b4b1 -s ours am: 33869c086d -s ours am: 9dfa1ac9c0 -s ours am: 24ad8bf36f -s ours
...
am skip reason: Change-Id I67a2f4be536fd22a9cc615088ce6368223311cf2 with SHA-1 473ba97def12470012
2020-09-02 01:59:21 +00:00
Xin Li
24ad8bf36f
[automerger skipped] Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master am: 386b47b4b1 -s ours am: 33869c086d -s ours am: 9dfa1ac9c0 -s ours
...
am skip reason: Change-Id I67a2f4be536fd22a9cc615088ce6368223311cf2 with SHA-1 473ba97def12470012
2020-09-01 22:09:56 +00:00
Xin Li
9dfa1ac9c0
[automerger skipped] Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master am: 386b47b4b1 -s ours am: 33869c086d -s ours
...
am skip reason: Change-Id I67a2f4be536fd22a9cc615088ce6368223311cf2 with SHA-1 473ba97def12470012
2020-09-01 21:46:40 +00:00
Xin Li
33869c086d
[automerger skipped] Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master am: 386b47b4b1 -s ours
...
am skip reason: Change-Id I67a2f4be536fd22a9cc615088ce6368223311cf2 with SHA-1 473ba97def12470012
2020-09-01 20:37:04 +00:00
Xin Li
386b47b4b1
Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master
2020-09-01 20:03:58 +00:00
Stephen Hines
4e731e95d9
Properly mark the type for ARM assembly functions. am: 331810f057 am: 924a4628e0 am: 3d799dd6ea am: 40accb2e61 am: 3484cf02b8
...
Original change: 1414133
2020-08-28 20:11:56 +00:00
Stephen Hines
3484cf02b8
Properly mark the type for ARM assembly functions. am: 331810f057 am: 924a4628e0 am: 3d799dd6ea am: 40accb2e61
...
Original change: 1414133
2020-08-28 19:56:17 +00:00
Stephen Hines
40accb2e61
Properly mark the type for ARM assembly functions. am: 331810f057 am: 924a4628e0 am: 3d799dd6ea
...
Original change: 1414133
2020-08-28 19:39:47 +00:00
Stephen Hines
3d799dd6ea
Properly mark the type for ARM assembly functions. am: 331810f057 am: 924a4628e0
...
Original change: 1414133
2020-08-28 19:09:10 +00:00
Stephen Hines
924a4628e0
Properly mark the type for ARM assembly functions. am: 331810f057
...
Original change: 1414133
2020-08-28 18:32:16 +00:00
Stephen Hines
331810f057
Properly mark the type for ARM assembly functions.
...
These functions may be called by either ARM or Thumb, and LLD has gotten
more strict. The global symbols must be marked with the proper type
annotations in order for the relocations to be correct.
ld.lld: error: external/libxaac/decoder/armv7/ixheaacd_qmf_dec_armv7.c:353:(.text.ixheaacd_esbr_cos_sin_mod+0x3A0): branch and link relocation: R_ARM_THM_CALL to non STT_FUNC symbol: ixheaacd_esbr_cos_sin_mod_loop2 interworking not performed; consider using directive '.type ixheaacd_esbr_cos_sin_mod_loop2, %function' to give symbol type STT_FUNC if interworking between ARM and Thumb is required
Bug: 155835175
Test: mm for ARM based build
Change-Id: I063cd9716402aaaebbd4273776eadb70314bf5f9
2020-08-27 19:47:23 -07:00
Xin Li
0312fc42cb
Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)
...
Bug: 166295507
Merged-In: I67a2f4be536fd22a9cc615088ce6368223311cf2
Change-Id: Iea753fbdfd54db2a0c5499ca481767192ccc55ca
2020-08-27 10:16:29 -07:00
Pirama Arumuga Nainar
35bc695d7b
resolve merge conflicts of d6f04bfbc2 to rvc-dev-plus-aosp am: 1713b4bfea am: f44a5a1898 am: 834c57586a
...
Original change: 12273973
2020-07-31 00:11:43 +00:00
Pirama Arumuga Nainar
834c57586a
resolve merge conflicts of d6f04bfbc2 to rvc-dev-plus-aosp am: 1713b4bfea am: f44a5a1898
...
Original change: 12273973
2020-07-30 23:53:57 +00:00
Pirama Arumuga Nainar
f44a5a1898
resolve merge conflicts of d6f04bfbc2 to rvc-dev-plus-aosp am: 1713b4bfea
...
Original change: 12273973
2020-07-30 23:35:51 +00:00
Pirama Arumuga Nainar
1713b4bfea
resolve merge conflicts of d6f04bfbc2 to rvc-dev-plus-aosp
2020-07-30 21:32:16 +00:00
Pirama Arumuga Nainar
d6f04bfbc2
Use blocklist sub-property in sanitize am: 6122d8fdb2
...
Original change: 1375090
2020-07-30 21:07:48 +00:00
Pirama Arumuga Nainar
6122d8fdb2
Use blocklist sub-property in sanitize
...
Update language to comply with Android’s inclusive language guidance
See https://source.android.com/setup/contribute/respectful-code for
reference
Bug: 161896447
Bug: 162245450
Test: build topic
Change-Id: I3bd7ee99914a13961e2afa7062a7019c24d01a46
2020-07-28 14:37:34 -07:00
Kris Alder
c4bfa0c185
Merge "Added fuzz_config field in xaac_dec_fuzzer" am: a4cd8c6bf6 am: 08c901b2ac am: 473ba97def am: db8a7b4c26 am: 03376358e5
...
Original change: 1318980
2020-06-05 17:22:41 +00:00
Kris Alder
03376358e5
Merge "Added fuzz_config field in xaac_dec_fuzzer" am: a4cd8c6bf6 am: 08c901b2ac am: 473ba97def am: db8a7b4c26
...
Original change: 1318980
2020-06-05 17:10:06 +00:00
Kris Alder
db8a7b4c26
Merge "Added fuzz_config field in xaac_dec_fuzzer" am: a4cd8c6bf6 am: 08c901b2ac am: 473ba97def
...
Original change: 1318980
2020-06-05 16:44:25 +00:00
Kris Alder
473ba97def
Merge "Added fuzz_config field in xaac_dec_fuzzer" am: a4cd8c6bf6 am: 08c901b2ac
...
Original change: 1318980
2020-06-05 16:26:48 +00:00
Kris Alder
08c901b2ac
Merge "Added fuzz_config field in xaac_dec_fuzzer" am: a4cd8c6bf6
...
Original change: 1318980
2020-06-05 16:09:42 +00:00
Kris Alder
a4cd8c6bf6
Merge "Added fuzz_config field in xaac_dec_fuzzer"
2020-06-05 15:50:05 +00:00
Automerger Merge Worker
628dd03e45
Merge "point to new repo hooks for mainline uploads am: 9087c50905 am: 64c0efeb63" into rvc-d1-dev-plus-aosp am: 65223c7c86 am: 5735f18f66
...
Change-Id: I3b02aec7accc7a5e55a26206161dec79f8e12455
2020-05-30 00:32:02 +00:00
Automerger Merge Worker
bdb5c9b63e
Merge "point to new repo hooks for mainline uploads am: 9087c50905 am: 5402bcf5ed am: 895c0e3e32" into rvc-qpr-dev-plus-aosp am: a3aa2c2902
...
Change-Id: I3cf600d8fd270f434e10e0f5b08bef9f12ccad7d
2020-05-30 00:31:30 +00:00
Ray Essick
2defaee701
point to new repo hooks for mainline uploads am: 9087c50905 am: 5402bcf5ed am: 73dc4fcf6f am: 87fb25ecb3
...
Change-Id: Iee4f0c11d88b8586216a0e232c235e9c426ca3ba
2020-05-30 00:30:13 +00:00
Automerger Merge Worker
5735f18f66
Merge "point to new repo hooks for mainline uploads am: 9087c50905 am: 64c0efeb63" into rvc-d1-dev-plus-aosp am: 65223c7c86
...
Change-Id: I5ddf8a9b943104a0d0bdcbcd7c945c5d49fb2bef
2020-05-30 00:17:17 +00:00
Automerger Merge Worker
a3aa2c2902
Merge "point to new repo hooks for mainline uploads am: 9087c50905 am: 5402bcf5ed am: 895c0e3e32" into rvc-qpr-dev-plus-aosp
2020-05-30 00:16:39 +00:00
Ray Essick
a043a3fca7
point to new repo hooks for mainline uploads am: 9087c50905 am: 5402bcf5ed am: 895c0e3e32
...
Change-Id: Id8a23080fa5dcc09bc45f30bb4930427e5d3cfad
2020-05-30 00:16:25 +00:00
Ray Essick
87fb25ecb3
point to new repo hooks for mainline uploads am: 9087c50905 am: 5402bcf5ed am: 73dc4fcf6f
...
Change-Id: I945dfd4f11a949ae793bdbdd3977c6c87f5deba3
2020-05-30 00:16:12 +00:00
Automerger Merge Worker
65223c7c86
Merge "point to new repo hooks for mainline uploads am: 9087c50905 am: 64c0efeb63" into rvc-d1-dev-plus-aosp
2020-05-30 00:03:37 +00:00
