summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2021-11-01Merge d492413c2e492d46cf878ff1c95c5bd19e202c64 on remote branchLA.UM.9.2.r1-03700-SDMxx0.0ks-aosp.lnx.3.0.r12-relLinux Build Service Account0-0/+0
Change-Id: I1d716ab1b65d5f2428127383cc5b6ab71108310f
2021-09-21Snap for 7750687 from 20c2d1eb7e4ab5ccb8dfa835444838f8edf9f200 to ↵Android Build Coastguard Worker0-0/+0
r-keystone-qcom-release Change-Id: I916d587cc2325c6c1148e0ffb1df612cf5049181
2021-09-16Merge mpr-2021-09-05Eric Arseneau0-0/+0
Change-Id: Iad92178239c3a51b58688862605c3fc05bb36bd8
2021-03-30Merge c9bbc45602332ff303b00724a9ca633a90832b24 on remote branchLA.UM.9.2.r1-03600-SDMxx0.0LA.UM.9.2.r1-03500-SDMxx0.0LA.UM.9.2.r1-03400-SDMxx0.0LA.UM.9.2.r1-03300-SDMxx0.0LA.UM.9.2.r1-03200-SDMxx0.0LA.UM.9.2.r1-03000-SDMxx0.0LA.UM.9.2.c25-01100-SDMxx0.0LA.UM.9.2.c25-00600-SDMxx0.0LA.UM.9.2.c25-00500-SDMxx0.0LA.UM.9.2.c25Linux Build Service Account2-5/+18
Change-Id: I1843f25cdf48d4fe78da9093651d5941e5e01b57
2021-03-17Snap for 7214043 from 734981c38fa45f19a9d3d8ac1e6ef597a9ca85c3 to ↵Android Build Role Account android-build-prod2-5/+18
r-keystone-qcom-release Change-Id: Ic15c8f5438be8af29c88c4de63abf0956b78060f
2021-03-09Merge spl-2021-03-05Eric Arseneau2-5/+18
Change-Id: I455800bd4e1903683e498270a6cd2d7cd99e3eb5
2021-02-10Merge 25b0180ec2f7f7eac845d1a32beb0a84173688b6 on remote branchLA.UM.9.2.r1-02700-SDMxx0.0LA.UM.9.2.r1-02500-SDMxx0.0LA.UM.9.2.c26-00700-SDMxx0.0LA.UM.9.2.c26Linux Build Service Account3-27/+47
Change-Id: I5c58ef0e4efad298a2981f7dbbbda20b3b3f9ce8
2021-01-12Snap for 7077657 from bfeb10a285f6d6e78f5f79e8f66a93c346874c35 to ↵LA.UM.9.6.3.r1-01200-89xx.0LA.UM.9.6.3.r1-00700-89xx.0LA.UM.9.6.3.r1-00300-89xx.0LA.QSSI.11.0.r99-00400.01-qssi.0LA.QSSI.11.0.r99Android Build Role Account android-build-prod3-27/+47
r-keystone-qcom-release Change-Id: I039905c1064b02d28680ee068a8e58eb3e5e4b47
2020-12-10Merge spl-2020-12-05Eric Arseneau3-27/+47
Change-Id: Ibe2f205853c78f73ca1ee020c75942fbca223407
2020-12-04Snap for 7010201 from 0ca63168a46b28551b3beca0c46393d8c9907594 to ↵android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32aosp-new/android11-qpr2-releaseandroid-build-team Robot2-5/+18
rvc-qpr2-release Change-Id: Ice5aae96ec42d4ec87cf432122afb155e0afb58f
2020-12-04Snap for 7010201 from 0ca63168a46b28551b3beca0c46393d8c9907594 to rvc-d2-releaseandroid-11.0.0_r48android-11.0.0_r47android-11.0.0_r45android-11.0.0_r44android-11.0.0_r42android-11.0.0_r41aosp-new/android11-d2-releaseandroid-build-team Robot2-5/+18
Change-Id: I53bcf8a3a9fc8028f2efa076c963b0e93a81f0cf
2020-12-01Camera: Document behavior when zoomRatio and cropRegion conflictandroid-11.0.0_r46android-11.0.0_r43android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38aosp-new/android11-qpr3-s1-releaseaosp-new/android11-qpr3-releaseShuzhen Wang2-5/+18
In case zoomRatio != 1.0 and cropRegion == windowboxing, specify the camera framework behavior overriding the cropRegion with active array. Test: Build Bug: 172873869 Change-Id: If61bc1720ab502826ccbaf0b8eac36d715e2a0ea
2020-11-18Merge b958ac585a34c5fc19dd6d877028a72c71aa6fcd on remote branchLA.UM.9.2.r1-02000-SDMxx0.0LA.UM.9.2.r1-01800-SDMxx0.0LA.UM.9.2.r1-01300-SDMxx0.0Linux Build Service Account2-2/+2
Change-Id: I50dac8a478906a9d1e61c59cd164fa074d8076c6
2020-10-08Snap for 6892585 from 34558910556a2cb3deb3460d6a84d9c8c99c9238 to ↵LAW.BR.5.1.r1-01200-89xx.0LAW.BR.5.1.r1-01000-89xx.0LAW.BR.5.1.r1-00700-89xx.0LA.UM.9.3.r1-01000-sdm845.0LA.UM.9.3.r1-00700-sdm845.0LA.UM.9.3.r1-00500-sdm845.0LAW.BR.5.1.r1Android Build Role Account android-build-prod2-2/+2
r-keystone-qcom-release Change-Id: I0591eb71d48002d61aa1bcb7abda10ad82e387a4
2020-10-07Snap for 6890386 from 65f1d9d660df9f0b6a2fe13c007e7f915b65defa to rvc-d2-releaseandroid-build-team Robot0-0/+0
Change-Id: I7cc544c0b6b602bdb1d2ddef5f86a7bed587113a
2020-10-07Snap for 6890386 from 65f1d9d660df9f0b6a2fe13c007e7f915b65defa to ↵android-build-team Robot0-0/+0
rvc-qpr2-release Change-Id: Iac21e04e3a4ba7ab39f6c42a0bade0f32afe9431
2020-10-07[automerger skipped] spdif: fix possible buffer overflow am: 1b72d76412 am: ↵Phil Burk0-0/+0
86ca73cbd3 -s ours am: 32b99befb3 -s ours am: d7c086743a -s ours am: e8a7e84274 -s ours am: 11f5386fec -s ours am: 10b636389f -s ours am: 2652aae1f9 -s ours am skip reason: Change-Id Ifc7f8c8946388e19f39f35d649a5936568f8b9b2 with SHA-1 762fbb3e09 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/media/+/12638670 Change-Id: I6a20569487e681c8d3ba42fb29e59504370dbc2e
2020-10-07[automerger skipped] spdif: fix possible buffer overflow am: 1b72d76412 am: ↵Phil Burk0-0/+0
86ca73cbd3 -s ours am: 32b99befb3 -s ours am: d7c086743a -s ours am: e8a7e84274 -s ours am: 11f5386fec -s ours am: 10b636389f -s ours am skip reason: Change-Id Ifc7f8c8946388e19f39f35d649a5936568f8b9b2 with SHA-1 762fbb3e09 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/media/+/12638670 Change-Id: I2a7aaac560ea4edfd75f68460465c91d2f7cbcbf
2020-10-07[automerger skipped] spdif: fix possible buffer overflow am: 1b72d76412 am: ↵Phil Burk0-0/+0
86ca73cbd3 -s ours am: 32b99befb3 -s ours am: d7c086743a -s ours am: e8a7e84274 -s ours am: 11f5386fec -s ours am skip reason: Change-Id Ifc7f8c8946388e19f39f35d649a5936568f8b9b2 with SHA-1 762fbb3e09 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/media/+/12638670 Change-Id: Iad31bba4e8565ae64906c79ddcd4e26528372d44
2020-10-07[automerger skipped] spdif: fix possible buffer overflow am: 1b72d76412 am: ↵Phil Burk0-0/+0
86ca73cbd3 -s ours am: 32b99befb3 -s ours am: d7c086743a -s ours am: e8a7e84274 -s ours am skip reason: Change-Id Ifc7f8c8946388e19f39f35d649a5936568f8b9b2 with SHA-1 762fbb3e09 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/media/+/12638670 Change-Id: If32ef07e33e54160b86a866112055ff2c0d88fb6
2020-10-07[automerger skipped] spdif: fix possible buffer overflow am: 762fbb3e09 -s ↵Phil Burk0-0/+0
ours am: 075b93f931 -s ours am: b941c1e8ff -s ours am: a61e2b8125 -s ours am: 182132e141 -s ours am: f34124922f -s ours am skip reason: Change-Id Ifc7f8c8946388e19f39f35d649a5936568f8b9b2 with SHA-1 b2fe1bc25c is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/media/+/12638669 Change-Id: Ie60157767098977e872f5f0792f5054f5035a6be
2020-10-07[automerger skipped] spdif: fix possible buffer overflow am: 762fbb3e09 -s ↵Phil Burk0-0/+0
ours am: 075b93f931 -s ours am: b941c1e8ff -s ours am: a61e2b8125 -s ours am: 182132e141 -s ours am skip reason: Change-Id Ifc7f8c8946388e19f39f35d649a5936568f8b9b2 with SHA-1 b2fe1bc25c is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/media/+/12638669 Change-Id: I4c02bae48c9da9688fe90fd6ddfe8ac2e63a2353
2020-10-07[automerger skipped] spdif: fix possible buffer overflow am: 1b72d76412 am: ↵Phil Burk0-0/+0
86ca73cbd3 -s ours am: 32b99befb3 -s ours am: d7c086743a -s ours am skip reason: Change-Id Ifc7f8c8946388e19f39f35d649a5936568f8b9b2 with SHA-1 762fbb3e09 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/media/+/12638670 Change-Id: Ic9ad85d82f77fe7fee152fa6dcdf142c5b35f7d3
2020-10-07[automerger skipped] spdif: fix possible buffer overflow am: b2fe1bc25c -s ↵Phil Burk0-0/+0
ours am: 62a0d0409b -s ours am: 7017fb5b49 -s ours am: b2b8014ab2 -s ours am: 24730901ab -s ours am skip reason: Change-Id Ifc7f8c8946388e19f39f35d649a5936568f8b9b2 with SHA-1 1f73a728ef is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/media/+/12638668 Change-Id: Idf10407adf31204ff9ea29c67c9f03d826852d17
2020-10-07[automerger skipped] spdif: fix possible buffer overflow am: 762fbb3e09 -s ↵Phil Burk0-0/+0
ours am: 075b93f931 -s ours am: b941c1e8ff -s ours am: a61e2b8125 -s ours am skip reason: Change-Id Ifc7f8c8946388e19f39f35d649a5936568f8b9b2 with SHA-1 b2fe1bc25c is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/media/+/12638669 Change-Id: I915216056ef60d9309b9b525323aa8dd6ee90356
2020-10-07[automerger skipped] spdif: fix possible buffer overflow am: 1b72d76412 am: ↵Phil Burk0-0/+0
86ca73cbd3 -s ours am: 32b99befb3 -s ours am skip reason: Change-Id Ifc7f8c8946388e19f39f35d649a5936568f8b9b2 with SHA-1 762fbb3e09 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/media/+/12638670 Change-Id: I620e68a998aa0a5358a5d10a39b4c06de0a6b616
2020-10-07[automerger skipped] spdif: fix possible buffer overflow am: b2fe1bc25c -s ↵Phil Burk0-0/+0
ours am: 62a0d0409b -s ours am: 7017fb5b49 -s ours am: b2b8014ab2 -s ours am skip reason: Change-Id Ifc7f8c8946388e19f39f35d649a5936568f8b9b2 with SHA-1 1f73a728ef is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/media/+/12638668 Change-Id: I430a796699ccbb3fb50d012114c183a4dc23518f
2020-10-07[automerger skipped] spdif: fix possible buffer overflow am: 762fbb3e09 -s ↵Phil Burk0-0/+0
ours am: 075b93f931 -s ours am: b941c1e8ff -s ours am skip reason: Change-Id Ifc7f8c8946388e19f39f35d649a5936568f8b9b2 with SHA-1 b2fe1bc25c is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/media/+/12638669 Change-Id: Ie09e89cf1b3c0c4fd5efd742b95f2123b80731c7
2020-10-07[automerger skipped] spdif: fix possible buffer overflow am: 1b72d76412 am: ↵Phil Burk0-0/+0
86ca73cbd3 -s ours am skip reason: Change-Id Ifc7f8c8946388e19f39f35d649a5936568f8b9b2 with SHA-1 762fbb3e09 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/media/+/12638670 Change-Id: Ibaac99c33bb33784d9901c5d8666605b1246e1b6
2020-10-07[automerger skipped] spdif: fix possible buffer overflow am: b2fe1bc25c -s ↵Phil Burk0-0/+0
ours am: 62a0d0409b -s ours am: 7017fb5b49 -s ours am skip reason: Change-Id Ifc7f8c8946388e19f39f35d649a5936568f8b9b2 with SHA-1 1f73a728ef is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/media/+/12638668 Change-Id: I1d9243e7d37f935d5035f44802cd979392e1a612
2020-10-07[automerger skipped] spdif: fix possible buffer overflow am: 762fbb3e09 -s ↵Phil Burk0-0/+0
ours am: 075b93f931 -s ours am skip reason: Change-Id Ifc7f8c8946388e19f39f35d649a5936568f8b9b2 with SHA-1 b2fe1bc25c is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/media/+/12638669 Change-Id: I2603bcba0a34cce60b62617e01c4515fc0157de7
2020-10-07spdif: fix possible buffer overflow am: 1b72d76412Phil Burk4-11/+31
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/media/+/12638670 Change-Id: Ib1c876ecd14703497dbe8244161fedeb064be061
2020-10-07[automerger skipped] spdif: fix possible buffer overflow am: 762fbb3e09 -s oursPhil Burk0-0/+0
am skip reason: Change-Id Ifc7f8c8946388e19f39f35d649a5936568f8b9b2 with SHA-1 b2fe1bc25c is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/media/+/12638669 Change-Id: I882a788494d98427a056892b084da17670f9e116
2020-10-07[automerger skipped] spdif: fix possible buffer overflow am: b2fe1bc25c -s ↵Phil Burk0-0/+0
ours am: 62a0d0409b -s ours am skip reason: Change-Id Ifc7f8c8946388e19f39f35d649a5936568f8b9b2 with SHA-1 1f73a728ef is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/media/+/12638668 Change-Id: Id39acd9200e4a5ca63670ae973b55ed1802040fd
2020-10-07[automerger skipped] spdif: fix possible buffer overflow am: b2fe1bc25c -s oursPhil Burk0-0/+0
am skip reason: Change-Id Ifc7f8c8946388e19f39f35d649a5936568f8b9b2 with SHA-1 1f73a728ef is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/media/+/12638668 Change-Id: Icf6e22440f729d66ee23af5165254af20b2b5c03
2020-10-06Add support for VX_AUDIO_FORMAT_LC3 in system libs.Manisha Agarwal2-2/+2
Add support for VX_AUDIO_FORMAT_LC3 in system libs. CRs-Fixed: 2791697 Change-Id: I718eb21d1fafbd4dafcaa7e6e2b71402f1ff5d18
2020-09-30Snap for 6875834 from 3cf456e6b32f30ff30bf9b86453ec51d933fb4f5 to rvc-d2-releaseandroid-build-team Robot2-15/+31
Change-Id: I394032cb91033df118c1d04a509bc34e7d578bce
2020-09-29Snap for 6872792 from 3cf456e6b32f30ff30bf9b86453ec51d933fb4f5 to ↵android-11.0.0_r31android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r19android-11.0.0_r18aosp-new/android11-qpr1-s2-releaseaosp-new/android11-qpr1-s1-releaseaosp-new/android11-qpr1-releaseaosp-new/android11-qpr1-d-s1-releaseaosp-new/android11-qpr1-d-releaseandroid-build-team Robot2-15/+31
rvc-qpr1-release Change-Id: Id9e440cef847b0a2fd0c91f26c7f95465e14f975
2020-09-29Camera: Clarify SCALER_CROP_REGION usage am: 3770561af1 am: 11804edf21android-11.0.0_r30aosp-new/android11-qpr1-c-releaseShuzhen Wang2-15/+31
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/media/+/12585894 Change-Id: Id571c94ad22e2bd9f2f9a07c756fb501b28182f1
2020-09-29Camera: Clarify SCALER_CROP_REGION usage am: 3770561af1Shuzhen Wang2-15/+31
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/media/+/12585894 Change-Id: I510670c1232c094520cc754d23fd392f40ab95c2
2020-09-25Snap for 6863807 from 266a3da6c7f5a9b30a5801bc69db098c6dfd807c to rvc-d2-releaseandroid-build-team Robot1-0/+6
Change-Id: I2b42ed5a05d1a0c9e9fcd2be8f20961e5dbd4c5b
2020-09-24Snap for 6862191 from 266a3da6c7f5a9b30a5801bc69db098c6dfd807c to ↵android-build-team Robot1-0/+6
rvc-qpr1-release Change-Id: Ieb7fcaef8ef916af46544bb231130d909f7178bf
2020-09-23audio_utils: check for zero numBytes in SPDIFEncoderPhil Burk1-0/+6
Fuzzing revealed that it was possible to read one word past the end of the burst buffer in the SPDIF Encoder. We can avoid that corner case by checking for numBytes equal to zero. Bug: 145262423 Test: see b/145262423#53 for fuzzing test instructions Test: atest spdif_tests Test: But if that does not work, try this: Test: mmm system/media/audio_utils Test: adb push $OUT/data/nativetest64/spdif_tests/spdif_tests /system/bin/. Test: adb shell spdif_tests Change-Id: If4ea3dfbfbd1fc9a7fbe0b5dfdc549f919ac2b40 Merged-In: If4ea3dfbfbd1fc9a7fbe0b5dfdc549f919ac2b40 (cherry picked from commit a486d6d653421da2a0f548138ca45b61fecc7b5e)
2020-09-18spdif: fix possible buffer overflowPhil Burk4-11/+31
SPDIF burst buffer could overflow if given bad data. Check for frmsiz in header being too low. Prevent numeric overflow in pending bytes calculation. Prevent numeric overflow when checking for buffer overflow. Bug: 145262423 Bug: 160265164 Test: tests/spdif_tests.cpp Change-Id: Ifc7f8c8946388e19f39f35d649a5936568f8b9b2 Merged-In: Ifc7f8c8946388e19f39f35d649a5936568f8b9b2 (cherry picked from commit 1f73a728ef4b6d7d350c0715bdb10d59e5b5f9be)
2020-09-18spdif: fix possible buffer overflowPhil Burk4-11/+31
SPDIF burst buffer could overflow if given bad data. Check for frmsiz in header being too low. Prevent numeric overflow in pending bytes calculation. Prevent numeric overflow when checking for buffer overflow. Bug: 145262423 Bug: 160265164 Test: tests/spdif_tests.cpp Change-Id: Ifc7f8c8946388e19f39f35d649a5936568f8b9b2 Merged-In: Ifc7f8c8946388e19f39f35d649a5936568f8b9b2 (cherry picked from commit 1f73a728ef4b6d7d350c0715bdb10d59e5b5f9be)
2020-09-18spdif: fix possible buffer overflowPhil Burk4-11/+31
SPDIF burst buffer could overflow if given bad data. Check for frmsiz in header being too low. Prevent numeric overflow in pending bytes calculation. Prevent numeric overflow when checking for buffer overflow. Bug: 145262423 Bug: 160265164 Test: tests/spdif_tests.cpp Change-Id: Ifc7f8c8946388e19f39f35d649a5936568f8b9b2 Merged-In: Ifc7f8c8946388e19f39f35d649a5936568f8b9b2 (cherry picked from commit 1f73a728ef4b6d7d350c0715bdb10d59e5b5f9be)
2020-09-16Camera: Clarify SCALER_CROP_REGION usageShuzhen Wang2-15/+31
1. Document same SCALER_CROP_REGION may map to different aspect ratio/output size for different sessions. 2. Remove the text in ZOOM_RATIO about using SCALER_CROP to change aspect ratio. Test: Build and read doc Bug: 168493526 Change-Id: I11d3a5a32255d4b8a71fd89632230f3003af9959
2020-09-15Merge 4fd1231fbf940763f1a08a572c88cfb007da1940 on remote branchLA.UM.9.2.r1-01000-SDMxx0.0LA.UM.9.2.r1-00900-SDMxx0.0Linux Build Service Account2-0/+4
Change-Id: Ib7ef0e997d61f534d0bf8b1bd02c377db4549b8b
2020-08-26Snap for 6792403 from b80fcbb7ee9b02c98aa999604f1cdee1829c6307 to rvc-d2-releaseandroid-build-team Robot2-12/+10
Change-Id: I85e38a86a8f25ae6a2f5bba9920a939db7333241
2020-08-20Merge 9c763f09061bb1243f0fcebcefe3255a68f29493 on remote branchLinux Build Service Account3-0/+62
Change-Id: I7720efaeae3ce95f5f7531d07709d18577e7acc1