Snap for 7010201 from 0ca63168a46b28551b3beca0c46393d8c9907594 to rvc-d2-release Change-Id: I53bcf8a3a9fc8028f2efa076c963b0e93a81f0cf]]>
Camera: Document behavior when zoomRatio and cropRegion conflict 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]]>
Snap for 6890386 from 65f1d9d660df9f0b6a2fe13c007e7f915b65defa to rvc-d2-release Change-Id: I7cc544c0b6b602bdb1d2ddef5f86a7bed587113a]]>
[automerger skipped] spdif: fix possible buffer overflow am: 1b72d76412 am: 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]]>
[automerger skipped] spdif: fix possible buffer overflow am: 1b72d76412 am: 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]]>
[automerger skipped] spdif: fix possible buffer overflow am: 1b72d76412 am: 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]]>
[automerger skipped] spdif: fix possible buffer overflow am: 1b72d76412 am: 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]]>
[automerger skipped] spdif: fix possible buffer overflow am: 762fbb3e09 -s 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]]>
[automerger skipped] spdif: fix possible buffer overflow am: 762fbb3e09 -s 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]]>
[automerger skipped] spdif: fix possible buffer overflow am: 1b72d76412 am: 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]]>
[automerger skipped] spdif: fix possible buffer overflow am: b2fe1bc25c -s 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]]>
[automerger skipped] spdif: fix possible buffer overflow am: 762fbb3e09 -s 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]]>
[automerger skipped] spdif: fix possible buffer overflow am: 1b72d76412 am: 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]]>
[automerger skipped] spdif: fix possible buffer overflow am: b2fe1bc25c -s 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]]>
[automerger skipped] spdif: fix possible buffer overflow am: 762fbb3e09 -s 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]]>
[automerger skipped] spdif: fix possible buffer overflow am: 1b72d76412 am: 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]]>
[automerger skipped] spdif: fix possible buffer overflow am: b2fe1bc25c -s 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]]>
[automerger skipped] spdif: fix possible buffer overflow am: 762fbb3e09 -s 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]]>
spdif: fix possible buffer overflow am: 1b72d76412 Original change: https://googleplex-android-review.googlesource.com/c/platform/system/media/+/12638670 Change-Id: Ib1c876ecd14703497dbe8244161fedeb064be061]]>
[automerger skipped] spdif: fix possible buffer overflow am: 762fbb3e09 -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: I882a788494d98427a056892b084da17670f9e116]]>
[automerger skipped] spdif: fix possible buffer overflow am: b2fe1bc25c -s 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]]>
[automerger skipped] spdif: fix possible buffer overflow am: b2fe1bc25c -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: Icf6e22440f729d66ee23af5165254af20b2b5c03]]>
Snap for 6875834 from 3cf456e6b32f30ff30bf9b86453ec51d933fb4f5 to rvc-d2-release Change-Id: I394032cb91033df118c1d04a509bc34e7d578bce]]>
Camera: Clarify SCALER_CROP_REGION usage am: 3770561af1 am: 11804edf21 Original change: https://googleplex-android-review.googlesource.com/c/platform/system/media/+/12585894 Change-Id: Id571c94ad22e2bd9f2f9a07c756fb501b28182f1]]>
Camera: Clarify SCALER_CROP_REGION usage am: 3770561af1 Original change: https://googleplex-android-review.googlesource.com/c/platform/system/media/+/12585894 Change-Id: I510670c1232c094520cc754d23fd392f40ab95c2]]>
Snap for 6863807 from 266a3da6c7f5a9b30a5801bc69db098c6dfd807c to rvc-d2-release Change-Id: I2b42ed5a05d1a0c9e9fcd2be8f20961e5dbd4c5b]]>
audio_utils: check for zero numBytes in SPDIFEncoder 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)]]>
spdif: fix possible buffer overflow 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)]]>
spdif: fix possible buffer overflow 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)]]>
spdif: fix possible buffer overflow 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)]]>