summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Adjust to vendor/lineage move to vendor/replicantreplicant-10Denis 'GNUtoo' Carikli2020-08-151-1/+1
| | | | Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
* Camera: Make originalDataSpace be const upon stream creationHEADlineage-17.1Shuzhen Wang2020-06-062-5/+2
| | | | | | | | | | | | The previous logic was wrong(!) where DATASPACE_UNKNOWN shouldn't be used as an initializtion condition. Test: CTS and vendor testing Bug: 139820060 Bug: 151405656 Change-Id: I6b59d40ff796d48fe1804b45c189004f1ecc8c18 Merged-In: I6b59d40ff796d48fe1804b45c189004f1ecc8c18 (cherry picked from 2f5010dfa412c4998ab4047bfd3e20b595def61b)
* avc/hevc: Align 128 everywhereWonsik Kim2020-06-062-4/+4
| | | | | | | Bug: 142924202 Test: media module tests Change-Id: Icef9b6b19d11bbf1ce0a2078113bfcc0a9cdc3ad (cherry picked from commit 48dfc8c137b161cfcf652947621439deed7d9252)
* Fix android.media.cts.ImageReaderDecoderTest fail on MT6580 projectMarcus Huang2020-06-064-4/+6
| | | | | | | | | | | | | | | | | | | | Root Cause: Google C2 H264/H265 decoder request 64-aligned stride from graphic block; but ARM GPU would return with 128-aligned stride when input height ONLY satisfies 2-aligned (e.g. 130). Solution: Revise stride alignment from 64 to 128 of C2 H264/H265 decoder Bug: 142924202 Test: Build C2 Codec Test: run cts -m CtsMediaTestCases -t android.media.cts.ImageReaderDecoderTest#testGoogH264Image run cts -m CtsMediaTestCases -t android.media.cts.ImageReaderDecoderTest#testGoogH264ImageReader run cts -m CtsMediaTestCases -t android.media.cts.ImageReaderDecoderTest#testGoogH265Image run cts -m CtsMediaTestCases -t android.media.cts.ImageReaderDecoderTest#testGoogH265ImageReader Change-Id: I6eaff1b858e031b64744bc67d8aee5cc51cfd92d (cherry picked from commit 28af1154b5f52c1f1a3687ff099ca609218bd78a)
* mediaswcodec: Set "default" as preferred servicePawin Vongmasa2020-06-062-4/+395
| | | | | | | | | | | | | | | | | | | Usage mapper will be retrieved from the preferred service if system properties for mediaswcodec's ION usage are not set. Test: Define system property "ro.com.android.media.swcodec.ion.heapmask" and check the log during the startup of mediaswcodec. Test: Manually log the mapper activity; test if gets invoked from mediaswcodec and CCodec. Test: atest CtsMediaTestCases -- \ --module-arg CtsMediaTestCases:size:small Bug: 144995284 Change-Id: Iebcd89bfa38de3c10b79f878462ba2af347ad332 Merged-In: Iebcd89bfa38de3c10b79f878462ba2af347ad332 (cherry picked from commit 235d6c703672db8923c707eab718233c7d79f4ed)
* Codec2Client: Add function to set preferred storePawin Vongmasa2020-06-062-5/+89
| | | | | | | | | Test: None Bug: 142782942 Change-Id: Ic2bc89bb3b44652717ee65d2bfd73b7d4af8d080 Merged-In: Ic2bc89bb3b44652717ee65d2bfd73b7d4af8d080 (cherry picked from commit a87e24eac1287fd36891c76fb19ebcc5e5664390)
* Merge tag 'android-10.0.0_r37' into ↵Kevin F. Haggerty2020-06-0153-306/+769
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | staging/lineage-17.1_merge-android-10.0.0_r37 Android 10.0.0 Release 37 (QQ3A.200605.001) * tag 'android-10.0.0_r37': (47 commits) RESTRICT AUTOMERGE: Camera: fix use after free in sensor timestamp keep tx3g{Buffer,Size,Filled} in sync Fix race condition in AudioTrack::releaseBuffer() Fix race condition in AudioRecord::releaseBuffer() rtsp: fix integer overflow caused by malformed packets IDrm: fix uninitialized variable in GET_OFFLINE_LICENSE_STATE audio policy: fix disordered sequence while changing device RESTRICT AUTOMERGE: Camera: fix use after free in sensor timestamp RESTRICT AUTOMERGE: Camera: fix use after free in sensor timestamp BnCrypto: fix use-before-init in CREATE_PLUGIN Camera: Add onCameraOpened/onCameraClosed callbacks [DO NOT MERGE] Fix Heap use after free in clearkey getSecureStops Check if calling uid is system uid for setAllowedPolicyCapture. clearkey default: parsePssh securely RESTRICT AUTOMERGE CCodec: make config consistent before/after flush Reduce the latecy of encoding 1st frame [media][sfplugin] fix -Wdangling-gsl [DO NOT MERGE] Fix uninitialized data in IHDCP decrypt OpusHeader: Fix integer overflow in GetOpusHeaderBuffers MPEG4Extractor: check the default sample info before checking the validity of sample size. ... Change-Id: Ibb33de8b4828ed99095af7d629ffc290c188e10d
| * Snap for 6373393 from 8e7be728199c9123744860ce80921fb605501c61 to ↵android-build-team Robot2020-04-071-1/+3
| |\ | | | | | | | | | | | | | | | qt-qpr3-release Change-Id: I139a49e004d31c1b3d23a957687a600b2aade901
| | * [automerger skipped] RESTRICT AUTOMERGE: Camera: fix use after free in ↵Yin-Chia Yeh2020-04-060-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | sensor timestamp am: 1859a38c4d -s ours am: 2c97e3371f -s ours am skip reason: Change-Id I5b10b680e0cce96ca49e1772770adb4835545472 with SHA-1 00c275670b is in history Change-Id: If66c429c5a7a919a0487f49f99a3eb67c04f2461
| | | * [automerger skipped] RESTRICT AUTOMERGE: Camera: fix use after free in ↵Yin-Chia Yeh2020-04-060-0/+0
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sensor timestamp am: 1859a38c4d -s ours am skip reason: subject contains skip directive Change-Id: I5f37c2d4a6ec2854b6a2e5337c2a009817983e4d
| | | | * RESTRICT AUTOMERGE: Camera: fix use after free in sensor timestampYin-Chia Yeh2020-03-171-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The metadata object might be overriden later and has it memory re-allocated; hence snaping the sensor timestamp value before we call into any method that might change the metadata. Test: build Bug: 150944913 Merged-In: I5b10b680e0cce96ca49e1772770adb4835545472 Change-Id: I5b10b680e0cce96ca49e1772770adb4835545472
| | * | | RESTRICT AUTOMERGE: Camera: fix use after free in sensor timestamp am: ↵Yin-Chia Yeh2020-04-060-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | 00c275670b Change-Id: I99c23ac07926c3759f3ba2a166545d6de3501246
| | | * | RESTRICT AUTOMERGE: Camera: fix use after free in sensor timestampYin-Chia Yeh2020-03-171-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The metadata object might be overriden later and has it memory re-allocated; hence snaping the sensor timestamp value before we call into any method that might change the metadata. Test: build Bug: 150944913 Merged-In: I0f944fc9133d3ab279859f20236d956d7ca338f8 Change-Id: I5b10b680e0cce96ca49e1772770adb4835545472
| | * | | RESTRICT AUTOMERGE: Camera: fix use after free in sensor timestampYin-Chia Yeh2020-04-061-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The metadata object might be overriden later and has it memory re-allocated; hence snaping the sensor timestamp value before we call into any method that might change the metadata. Test: build Bug: 150944913 Merged-In: I0f944fc9133d3ab279859f20236d956d7ca338f8 Change-Id: I5b10b680e0cce96ca49e1772770adb4835545472
| * | | | Snap for 6362707 from 687d14d2fe23b87c584b41b01f24e3f2596baf18 to ↵android-build-team Robot2020-04-031-0/+6
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | qt-qpr3-release Change-Id: I8b0ec1b37f2dcd77469304694806ffec81190980
| | * | | keep tx3g{Buffer,Size,Filled} in syncRay Essick2020-03-301-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wasn't clearing size/filled when we cleared buffer. Bug: 151159638 Test: poc, but it didn't fail either before or after the patch (cherry picked from commit f2acb7a0185cac34a1a688416879eda26ead4b14) Change-Id: Ie62c28c0b91a1ec36ba1a307fea5ff73d5c085bf
| * | | | Snap for 6344022 from 01e349c1e70e48d9d4c88ad51b0732d674eb89ba to ↵android-build-team Robot2020-03-281-0/+12
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | qt-qpr3-release Change-Id: Ib10b77b00dabf97477b78ceecc4ab5d9abe81b30
| | * | | Merge "rtsp: fix integer overflow caused by malformed packets" into qt-qpr1-devRobert Shih2020-03-281-0/+12
| | |\ \ \
| | | * | | rtsp: fix integer overflow caused by malformed packetsRobert Shih2020-03-211-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 123940919 Test: adb shell am start -a android.intent.action.VIEW \ -n com.google.android.apps.photos/.pager.HostPhotoPagerActivity \ -t video/'*' -d rtsp://<rtsp_server2.py.host>/a.mp4 Change-Id: I2ef55d218e91aa4134150895ccf49ff81bee5891
| * | | | | Snap for 6341266 from 2c652db6efb758f7418895d3af2e69e6974bd36f to ↵android-build-team Robot2020-03-271-0/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt-qpr3-release Change-Id: I0ef8158dfc7ded813a2e7bec0b7cf29145b94b46
| | * | | | Merge "IDrm: fix uninitialized variable in GET_OFFLINE_LICENSE_STATE" into ↵Robert Shih2020-03-271-0/+1
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | qt-qpr1-dev
| | | * | | | IDrm: fix uninitialized variable in GET_OFFLINE_LICENSE_STATERobert Shih2020-03-201-0/+1
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 146052771 Test: drmServicePoc Change-Id: Ia34b9af4b6591812efcba0d9b67348c8b9a4dd3a Merged-In: I8e409e7048c9058f2d91ad2d467131f49e378259
| * | | | | Snap for 6337011 from ae2c605380345aa2b08b9f78f16161a5cb9d6f7c to ↵android-build-team Robot2020-03-267-20/+80
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt-qpr3-release Change-Id: I10fdf783b0d265b61ddada020b0716a3a25be0f3
| | * | | | Merge "[media][sfplugin] fix -Wdangling-gsl" into qt-qpr1-devBryan Ferris2020-03-261-3/+4
| | |\ \ \ \
| | | * | | | [media][sfplugin] fix -Wdangling-gslNick Desaulniers2020-02-271-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | C2BufferData#linearBlocks() returns a std::vector. Chaining method calls results in an immediate dereference of a dangling pointer. Save a reference to the otherwise temporary for the duration of the function call. Bug: 142544793 Test: m, flash device Change-Id: I99d662a8fe5deec652cdcd82f420c836c76d5539 Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
| | * | | | | Merge "Fix race condition in AudioTrack::releaseBuffer()" into qt-qpr1-devGlenn Kasten2020-03-252-2/+16
| | |\ \ \ \ \
| | | * | | | | Fix race condition in AudioTrack::releaseBuffer()Glenn Kasten2020-03-242-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ignore releaseBuffer() if it is for a different IAudioTrack than was used for obtainBuffer(). Bug: 136268149 Test: at bug comments #32 and #45 Change-Id: I2e1955c60479edcba6e7d66c98b9faef088b65d9
| | * | | | | | Merge "Fix race condition in AudioRecord::releaseBuffer()" into qt-qpr1-devGlenn Kasten2020-03-252-2/+16
| | |\| | | | |
| | | * | | | | Fix race condition in AudioRecord::releaseBuffer()Glenn Kasten2020-03-242-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ignore releaseBuffer() if it is for a different IAudioRecord than was used for obtainBuffer(). Bug: 136268149 Test: at bug comments #26 and #27 Change-Id: I2a08c30bf9187b35535318761eaac7856da68c11
| | * | | | | | Merge changes from topic "backport-cpu-usage-bugs" into qt-qpr1-devTreeHugger Robot2020-03-252-13/+44
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: MPEG4Extractor: check the default sample info before checking the validity of sample size. Add size checking for 'saiz' box Add more size checking for 'stts' box Add more size checking for 'stss' box Add size checking for 'saio' box
| | | * | | | | | MPEG4Extractor: check the default sample info before checking the validity ↵Dongwon Kang2020-02-241-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of sample size. Test: atest MediaPlayerDrmTest Bug: 135215092, Bug: 124525515 Change-Id: I6383514acaf546734b320224342a61cbd362c4bf
| | | * | | | | | Add size checking for 'saiz' boxDongwon Kang2020-02-241-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: run poc Bug: 124525515 Change-Id: I64a20c508b6d3f3de96c889e5660f9ec6950fd2e
| | | * | | | | | Add more size checking for 'stts' boxDongwon Kang2020-02-241-10/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note: new limit, data_size - 8, should be smaller than the previous one, UINT_MAX, since we global atom size checking with kMaxAtomSize, 2^26. Test: run poc Bug: 127973550 Change-Id: I1744d71d2e10183dd2bebfd01b15d9ee5998fdf3
| | | * | | | | | Add more size checking for 'stss' boxDongwon Kang2020-02-241-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: run poc Bug: 124771364 Change-Id: Id34dea17f78715eb7c44a3959c654b0f09ead3fb
| | | * | | | | | Add size checking for 'saio' boxDongwon Kang2020-02-241-1/+19
| | | | |/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: run poc Bug: 124526959 Change-Id: I9ec41f8d27c613609de6cfff2474793f88c5b956
| * | | | | | | Snap for 6332289 from 40ac2f6b22375f13ba1dde2f8d6c08fbb8e3f0e8 to ↵android-build-team Robot2020-03-253-19/+76
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt-qpr3-release Change-Id: If9648ee0bf680a97f50542e1bc49c11b68a4e68b
| | * | | | | | Merge "[DO NOT MERGE] Fix Heap use after free in clearkey getSecureStops" ↵TreeHugger Robot2020-03-252-3/+19
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into qt-qpr1-dev
| | | * | | | | | [DO NOT MERGE] Fix Heap use after free in clearkey getSecureStopsEdwin Wong2020-03-062-3/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Security Vulnerability fix: Heap use after free in getSecureStops in android.hardware.drm@1.1-service.clearkey Test: adb shell ps | grep clearkey pid ID does not change after running drmpoc Test: sts ANDROID_BUILD_TOP= ./android-sts/tools/sts-tradefed run sts-engbuild-no-spl-lock -m StsHostTestCases --test android.security.sts.Poc19_07#testPocBug_137878930 bug: 137878930 Merged-In: I78b2dc2bccde238a06398b3733cea8e574ea8ee7 Change-Id: I4fa2f0ad3f3360812987223f507a7394357080b3
| | * | | | | | | Merge "aaudio: add checks for Binder return codes" into qt-qpr1-devTreeHugger Robot2020-03-251-16/+57
| | |\ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| | | * | | | | | aaudio: add checks for Binder return codesPhil Burk2020-02-061-16/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Binder code was calling readInt32() but not checking the return code. Bug: 139473816 Test: see bug for proof of concept Test: atest CtsNativeMediaAAudioTestCases Change-Id: I9246382b657c2a1213d27c66fc006578553f7b1e Merged-In: I9246382b657c2a1213d27c66fc006578553f7b1e
| * | | | | | | | Snap for 6324712 from 2d3c39c7ecfe6a34b013102496979a6f02649d4a to ↵android-build-team Robot2020-03-231-0/+12
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt-qpr3-release Change-Id: I3090741cb51738b715d26ba3eaebd5a898fe09d8
| | * | | | | | | Merge "MTP: Sanitize filename provided from MTP host" into qt-qpr1-devTreeHugger Robot2020-03-231-0/+12
| | |\ \ \ \ \ \ \
| | | * | | | | | | MTP: Sanitize filename provided from MTP hostJames Wei2020-02-131-0/+12
| | | | |_|/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix potential security vulnerability via MTP path traversal Bug: 130656917 Test: atest frameworks/av/media/mtp/tests Test: Manual test: modified libmtp for path traversal attack Test: Manual test: normal recursive folder copy Note: Also patched with 68ccf5c (b/135764253) Change-Id: I467e1e6a76d09951050f7f45e5a63419e540c572 (cherry picked from commit e783e4b24b9e4080e50c50d62a24bcbfabb3e03d) Merged-In: I467e1e6a76d09951050f7f45e5a63419e540c572
| * | | | | | | | Snap for 6317653 from 40e794335b92f2f5237bcfddab454758cc4ad246 to ↵android-build-team Robot2020-03-2014-33/+225
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt-qpr3-release Change-Id: I6c96deb11617a96c07703eafa55edbc05f1c8746
| | * | | | | | | Merge "OpusHeader: Fix integer overflow in GetOpusHeaderBuffers" into ↵TreeHugger Robot2020-03-201-0/+4
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt-qpr1-dev
| | | * | | | | | | OpusHeader: Fix integer overflow in GetOpusHeaderBuffersHarish Mahendrakar2020-02-261-0/+4
| | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unified CSD parsing now checks for valid size of CSD Bug: 142861738 Test: poc in bug Test: atest android.media.cts.DecoderTest Change-Id: Iff742d2fdf4139bab7b5f378c1742ef52c0bbc78 Merged-In: Iff742d2fdf4139bab7b5f378c1742ef52c0bbc78
| | * | | | | | | Merge "[DO NOT MERGE] Crash the process when midi extraction times out" into ↵Ytai Ben-tsvi2020-03-209-2/+174
| | |\ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | | | | | | | | | | | qt-qpr1-dev
| | | * | | | | | [DO NOT MERGE] Crash the process when midi extraction times outYtai Ben-Tsvi2020-02-129-2/+174
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is intended to recover from cases when the MIDI extractor gets stuck in an infinite (or very long) loop. The extractor code is 3rd party and hard to harden - this gives us at least an eventual recovery. Change-Id: I8d2fd85f91d1d2749c5620cf8518583076d2f6d7 Bug: 127313764 Bug: 127313537 Bug: 127313223 Bug: 127312550 Bug: 127310810 Bug: 126380818 Bug: 123700383 Merged-In: I8d2fd85f91d1d2749c5620cf8518583076d2f6d7
| | * | | | | | | Merge "Really fix excessive 'trun' box parsing" into qt-qpr1-devTreeHugger Robot2020-03-201-8/+9
| | |\ \ \ \ \ \ \
| | | * | | | | | | Really fix excessive 'trun' box parsingRay Essick2020-02-131-8/+9
| | | | |/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | marks video tracks with excessive trun boxes filled with defaults as invalid. handles overflow in the constructed vector of samples. Bug: 124389881 Test: poc Change-Id: If89c912d73340e41fd8ea81d74595a56987c961d (cherry picked from commit 6707df1fea60bd7147262f7d7b2f1cece1687004)
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-01 02:01:50 +0000