summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-07-27Merge cherrypicks of [4647037, 4647038, 4647883, 4647039, 4647933, 4648530, ↵android-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r34android-wear-9.0.0_r33android-wear-9.0.0_r32android-wear-9.0.0_r31android-wear-9.0.0_r30android-wear-9.0.0_r3android-wear-9.0.0_r29android-wear-9.0.0_r28android-wear-9.0.0_r27android-wear-9.0.0_r26android-wear-9.0.0_r25android-wear-9.0.0_r24android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-wear-9.0.0_r1android-9.0.0_r8android-9.0.0_r7android-9.0.0_r6android-9.0.0_r18android-9.0.0_r10pie-release-2pie-r2-s2-releasepie-r2-s1-releasepie-r2-releaseandroid-build-team Robot
4648550, 4648551, 4648552, 4648553, 4646931, 4646932, 4646933, 4646934, 4648391, 4647976, 4647977, 4647978, 4647526, 4646972, 4646935, 4646936, 4646937, 4646938, 4646939, 4646940, 4646941, 4648392, 4647509, 4648630, 4648631, 4647934] into pi-release-2 Change-Id: Icd1c3fca59b6dba2529132cb4d5bcf7a2150ba3f
2018-07-27mm-video-v4l2: Protect buffer access and increase input buffer sizeSanthosh Behara
Protect buffer access for below scenarios: *Increase the scope of buf_lock in free_buffer to avoid access of freed buffer for both input and output buffers. Also, add check before output buffer access. *Disallow allocate buffer mode after client has called use buffer. Allocate additional 512 bytes of memory for input buffers on top of allocation size as per hardware requirement. Bug: 64340487 Test: ran POC on bullhead/nyc-dev Change-Id: Iabbb2d7e00ff97bfc47b04386feec66976fca99a (cherry picked from commit 83aeab22d1bdc493b3ea2f50616bb8fd460d6c74)
2018-07-27mm-video-v4l2: Protect buffer access and increase input buffer sizeRay Essick
Protect buffer access for below scenarios: *Increase the scope of buf_lock in free_buffer to avoid access of freed buffer for both input and output buffers. Also, add check before output buffer access. *Disallow allocate buffer mode after client has called use buffer. Allocate additional 512 bytes of memory for input buffers on top of allocation size as per hardware requirement. Bug: 64340487 Test: ran POC on sailfish/nyc-mr1-dev Change-Id: Id699404d6c276c8702826d79b3a6ba9755b3439f (cherry picked from commit 5e811c42a3c29f77c95ebf2eaa8975c5c2058ca3)
2018-07-27mm-video-v4l2: Squash below changesRay Essick
mm-video-v4l2: Protect buffer access and increase input buffer size Protect buffer access for below scenarios: *Increase the scope of buf_lock in free_buffer to avoid access of freed buffer for both input and output buffers. Also, add check before output buffer access. *Disallow allocate buffer mode after client has called use buffer. Allocate additional 512 bytes of memory for input buffers on top of allocation size as per hardware requirement. mm-video-v4l2: correct the buffer error flag setting The buffer error flag setting is corrected in free_buffer() call Bug: 64340487 Test: poc from bug Change-Id: I32d6cb7f61b873edd567881d1bf3e620cd78e715 (cherry picked from commit ff8cc2b25beca2401208e5e04840f58b8f4055fd)
2018-05-13Snap for 4778776 from 3ae7d9ba54de8940f04dcf43bc751d0fa7ddaa77 to pi-releaseandroid-vts-9.0_r4android-security-9.0.0_r76android-security-9.0.0_r75android-security-9.0.0_r74android-security-9.0.0_r73android-security-9.0.0_r72android-security-9.0.0_r71android-security-9.0.0_r70android-security-9.0.0_r69android-security-9.0.0_r68android-security-9.0.0_r67android-security-9.0.0_r66android-security-9.0.0_r65android-security-9.0.0_r64android-security-9.0.0_r63android-security-9.0.0_r62android-cts-9.0_r2android-cts-9.0_r1android-9.0.0_r61android-9.0.0_r60android-9.0.0_r59android-9.0.0_r58android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r49android-9.0.0_r48android-9.0.0_r3android-9.0.0_r2android-9.0.0_r1security-pi-releasepie-security-releaseandroid-build-team Robot
Change-Id: Ia2d4f9b15f72e143bdcc86d7d28281110b5e06f6
2018-05-11Merge "mm-video-v4l2: vdec: Handle color transfer enums for HDR content" ↵pie-devTreeHugger Robot
into pi-dev
2018-05-10mm-video-v4l2: vdec: Handle color transfer enums for HDR contentSanthosh Behara
(cherry-picked from https://partner-android-review.googlesource.com/c/platform/hardware/qcom/media/+/1069023) Added support to handle color transfer characteristics enum values for HDR content Bug:76227412 Change-Id: I25e34bbb746defa49115b4c846ea9b7234d6a937
2018-05-06Snap for 4765094 from 6eb5ee5a75aea017af1bab5d38729a1eb327aee5 to pi-releaseandroid-build-team Robot
Change-Id: I0c91ca531ba4830df06e51d5a3a28b4c6fd68b64
2018-05-04[automerger skipped] Merge changes from topic ↵Ray Essick
"am-de30185d-edfc-49d5-b5e1-aa1bdb83d97a" into oc-dev am: f6bc541263 -s ours am: 9d54deadfe -s ours am: 9db527e44b -s ours Change-Id: I8acbd4ad1e0fb0b2f77b9c0bf79da2e9d5336387
2018-05-04[automerger skipped] Merge changes from topic ↵android-build-team Robot
"am-96a5eb3e-2317-4e97-b0f7-e4891ab64c97" into oc-dev am: 931f0f7098 -s ours am: e8397ec00a -s ours am: 823f777945 -s ours Change-Id: I860a4e3a7c8f4da19db82d13ead82d605bb7ae86
2018-05-04[automerger skipped] Merge changes from topic ↵Ray Essick
"am-de30185d-edfc-49d5-b5e1-aa1bdb83d97a" into oc-dev am: f6bc541263 -s ours am: 9d54deadfe -s ours Change-Id: I5c5b6e985062374998459273d68d612bf92f59b2
2018-05-04[automerger skipped] Merge changes from topic ↵android-build-team Robot
"am-96a5eb3e-2317-4e97-b0f7-e4891ab64c97" into oc-dev am: 931f0f7098 -s ours am: e8397ec00a -s ours Change-Id: I5502ea22beed77033d518bfdb27390cb516b7340
2018-05-04[automerger skipped] Merge changes from topic ↵Ray Essick
"am-de30185d-edfc-49d5-b5e1-aa1bdb83d97a" into oc-dev am: f6bc541263 -s ours Change-Id: Icd383651879f307afb266c9c858c0df4572d2488
2018-05-04[automerger skipped] Merge changes from topic ↵android-build-team Robot
"am-96a5eb3e-2317-4e97-b0f7-e4891ab64c97" into oc-dev am: 931f0f7098 -s ours Change-Id: I35a22a326f2265d59ae64145e5734d3f76721f12
2018-05-04Merge changes from topic "am-de30185d-edfc-49d5-b5e1-aa1bdb83d97a" into oc-devRay Essick
* changes: [automerger] Revert "mm-video-v4l2: Protect buffer access and increase input buffer size" am: e1dfe8f504 am: f8f1a5f63d am: d43877ace1 skipped: d4481934db am: 7240438e1f am: 7f08f16258 am: 2fd221ebe8 am: e071682ab1 am: a8c07e024b [automerger] Revert "mm-video-v4l2: Protect buffer access and increase input buffer size" am: e1dfe8f504 am: f8f1a5f63d am: d43877ace1 skipped: d4481934db am: 7240438e1f am: 7f08f16258 am: 2fd221ebe8 am: e071682ab1 [automerger] Revert "mm-video-v4l2: Protect buffer access and increase input buffer size" am: e1dfe8f504 am: f8f1a5f63d am: d43877ace1 skipped: d4481934db am: 7240438e1f am: 7f08f16258 am: 2fd221ebe8 [automerger] Revert "mm-video-v4l2: Protect buffer access and increase input buffer size" am: e1dfe8f504 am: f8f1a5f63d am: d43877ace1 skipped: d4481934db am: 7240438e1f am: 7f08f16258 [automerger] Revert "mm-video-v4l2: Protect buffer access and increase input buffer size" am: e1dfe8f504 am: f8f1a5f63d am: d43877ace1 skipped: d4481934db am: 7240438e1f [automerger] Revert "mm-video-v4l2: Protect buffer access and increase input buffer size" am: e1dfe8f504 am: f8f1a5f63d am: d43877ace1 skipped: d4481934db [automerger] Revert "mm-video-v4l2: Protect buffer access and increase input buffer size" am: e1dfe8f504 am: f8f1a5f63d am: d43877ace1 [automerger] Revert "mm-video-v4l2: Protect buffer access and increase input buffer size" am: e1dfe8f504 am: f8f1a5f63d [automerger] Revert "mm-video-v4l2: Protect buffer access and increase input buffer size" am: e1dfe8f504 Revert "mm-video-v4l2: Protect buffer access and increase input buffer size"
2018-05-04Merge changes from topic "am-96a5eb3e-2317-4e97-b0f7-e4891ab64c97" into oc-devandroid-build-team Robot
* changes: [automerger skipped] Revert "mm-video-v4l2: Protect buffer access and increase input buffer size" skipped: 2e2293b82e skipped: 5d8ba5e98f skipped: 76637d6380 skipped: 525005edf5 skipped: 229feaed1a [automerger skipped] Revert "mm-video-v4l2: Protect buffer access and increase input buffer size" skipped: 2e2293b82e skipped: 5d8ba5e98f skipped: 76637d6380 skipped: 525005edf5 [automerger skipped] Revert "mm-video-v4l2: Protect buffer access and increase input buffer size" skipped: 2e2293b82e skipped: 5d8ba5e98f skipped: 76637d6380 [automerger skipped] Revert "mm-video-v4l2: Protect buffer access and increase input buffer size" skipped: 2e2293b82e skipped: 5d8ba5e98f [automerger skipped] Revert "mm-video-v4l2: Protect buffer access and increase input buffer size" skipped: 2e2293b82e Revert "mm-video-v4l2: Protect buffer access and increase input buffer size"
2018-05-04[automerger skipped] Merge changes from topic ↵android-build-team Robot
"am-23973cb8-6ed2-4797-9749-019d6251e3c6" into oc-dev am: bb411369f5 -s ours am: 0be491ae2b -s ours am: c705508576 -s ours Change-Id: Ib2e7b79320225de19d0a1ff66fdb431117d8b538
2018-05-04[automerger skipped] Merge changes from topic ↵android-build-team Robot
"am-23973cb8-6ed2-4797-9749-019d6251e3c6" into oc-dev am: bb411369f5 -s ours am: 0be491ae2b -s ours Change-Id: Ie9b777d06d1713c8528da8cd08fb05d88afc8c34
2018-05-04[automerger skipped] Merge changes from topic ↵android-build-team Robot
"am-23973cb8-6ed2-4797-9749-019d6251e3c6" into oc-dev am: bb411369f5 -s ours Change-Id: I304f5728fc729868fb463c92fc4ae8175c562df9
2018-05-04Merge changes from topic "am-23973cb8-6ed2-4797-9749-019d6251e3c6" into oc-devandroid-build-team Robot
* changes: [automerger] Revert "mm-video-v4l2: Protect buffer access and increase input buffer size" am: b2255366c0 am: 188d112d9c am: f990c7a4c9 am: 7f917145d0 [automerger] Revert "mm-video-v4l2: Protect buffer access and increase input buffer size" am: b2255366c0 am: 188d112d9c am: f990c7a4c9 [automerger] Revert "mm-video-v4l2: Protect buffer access and increase input buffer size" am: b2255366c0 am: 188d112d9c [automerger] Revert "mm-video-v4l2: Protect buffer access and increase input buffer size" am: b2255366c0 Revert "mm-video-v4l2: Protect buffer access and increase input buffer size"
2018-05-04[automerger skipped] Revert "mm-video-v4l2: Protect buffer access and ↵Ray Essick
increase input buffer size" skipped: 53f90b755f am: c89371f526 -s ours am: 119d3cd235 -s ours am: 8d1e3fb392 -s ours Change-Id: I7dea0669a98702cd18c6001ad829511caba06060
2018-05-04[automerger skipped] Revert "mm-video-v4l2: Protect buffer access and ↵Ray Essick
increase input buffer size" skipped: 53f90b755f am: c89371f526 -s ours am: 119d3cd235 -s ours Change-Id: I8d7c2c54c9fe7bf9bb61ed1b65d78ab89acb574e
2018-05-04[automerger skipped] Revert "mm-video-v4l2: Protect buffer access and ↵Ray Essick
increase input buffer size" skipped: 53f90b755f am: c89371f526 -s ours Change-Id: I01a54b897301b20858224f1738831aa16c6c4fed
2018-05-03[automerger skipped] Merge "Revert "mm-video-v4l2: Protect buffer access and ↵Ray Essick
increase input buffer size"" into oc-dev am: 0f3c74068c -s ours am: 3d7f60b2e6 -s ours am: f1a6fb3e17 -s ours Change-Id: I63dccc610275ecbf8fd8e79748d815a0c858a2f7
2018-05-03[automerger skipped] Merge "Revert "mm-video-v4l2: Protect buffer access and ↵Ray Essick
increase input buffer size"" into oc-dev am: 0f3c74068c -s ours am: 3d7f60b2e6 -s ours Change-Id: Id858b42408846ba63aa80fe368b5fe2a56b289a6
2018-05-03[automerger skipped] Merge "Revert "mm-video-v4l2: Protect buffer access and ↵Ray Essick
increase input buffer size"" into oc-dev am: 0f3c74068c -s ours Change-Id: Iead4c25ef442e938e806a00edfa581296ade340d
2018-05-04[automerger skipped] Revert "mm-video-v4l2: Protect buffer access and ↵Android Build Merger (Role)
increase input buffer size" skipped: 53f90b755f Change-Id: Ib99230ac377f3e3bf69ad47194a9aca584484c65
2018-05-04Revert "mm-video-v4l2: Protect buffer access and increase input buffer size"Ray Essick
This reverts commit 65f18a79b73df2cca7592fce98debc286a0fe318. Reason for revert: regressions at oc-mr1/bullhead Change-Id: Ibd1ed01c7d740553b3cf90b6f3dd2fd447563284 Bug: 64340487 Bug: 78291359 Bug: 78913375 Merged-In: I1763963839375db90f76dd0022bd1767ac5f067d Merged-In: I69398d4fb236289be5f0b79f8db9a3bc30144b90 Merged-In: Ie9caad90482698913db06cdb9aeebfd869fe1a6a
2018-05-04Merge "Revert "mm-video-v4l2: Protect buffer access and increase input ↵Ray Essick
buffer size"" into oc-dev
2018-05-03[automerger skipped] Merge "Revert "mm-video-v4l2: Protect buffer access and ↵Ray Essick
increase input buffer size"" into oc-mr1-dev am: 41d82f5920 -s ours Change-Id: I574516988bb717d62f7736912833be596253aca3
2018-05-04Merge "Revert "mm-video-v4l2: Protect buffer access and increase input ↵Ray Essick
buffer size"" into oc-mr1-dev
2018-05-03Merge "Revert "mm-video-v4l2: Protect buffer access and increase input ↵Ray Essick
buffer size"" into pi-dev
2018-05-02[automerger] Revert "mm-video-v4l2: Protect buffer access and increase input ↵Android Build Merger (Role)
buffer size" am: e1dfe8f504 am: f8f1a5f63d am: d43877ace1 skipped: d4481934db am: 7240438e1f am: 7f08f16258 am: 2fd221ebe8 am: e071682ab1 am: a8c07e024b Change-Id: Ibdd3ef48bada43520c4ef629bcd4c805ed6895da
2018-05-02[automerger] Revert "mm-video-v4l2: Protect buffer access and increase input ↵Android Build Merger (Role)
buffer size" am: e1dfe8f504 am: f8f1a5f63d am: d43877ace1 skipped: d4481934db am: 7240438e1f am: 7f08f16258 am: 2fd221ebe8 am: e071682ab1 Change-Id: I7a424d6e494f88d1378ec37202cbee0b0cc54f9f
2018-05-02[automerger] Revert "mm-video-v4l2: Protect buffer access and increase input ↵Android Build Merger (Role)
buffer size" am: e1dfe8f504 am: f8f1a5f63d am: d43877ace1 skipped: d4481934db am: 7240438e1f am: 7f08f16258 am: 2fd221ebe8 Change-Id: I6176d4efb62a16b9e582a09b0c7419df9cfba82e
2018-05-02[automerger] Revert "mm-video-v4l2: Protect buffer access and increase input ↵Android Build Merger (Role)
buffer size" am: e1dfe8f504 am: f8f1a5f63d am: d43877ace1 skipped: d4481934db am: 7240438e1f am: 7f08f16258 Change-Id: Iefde378ef0b018d5b44048a95af2cab40178bb79
2018-05-02[automerger] Revert "mm-video-v4l2: Protect buffer access and increase input ↵Android Build Merger (Role)
buffer size" am: e1dfe8f504 am: f8f1a5f63d am: d43877ace1 skipped: d4481934db am: 7240438e1f Change-Id: I85234224449bf90cd3ae8c2197c5aab709c73524
2018-05-02[automerger] Revert "mm-video-v4l2: Protect buffer access and increase input ↵Android Build Merger (Role)
buffer size" am: e1dfe8f504 am: f8f1a5f63d am: d43877ace1 skipped: d4481934db Change-Id: I273e95452265902500d3631dcb29ce374a55aa7d
2018-05-02[automerger] Revert "mm-video-v4l2: Protect buffer access and increase input ↵Android Build Merger (Role)
buffer size" am: e1dfe8f504 am: f8f1a5f63d am: d43877ace1 Change-Id: Ib021f2eed779209077b6ea867813b0f4119c9f34
2018-05-02[automerger] Revert "mm-video-v4l2: Protect buffer access and increase input ↵Android Build Merger (Role)
buffer size" am: e1dfe8f504 am: f8f1a5f63d Change-Id: Icb4bac6b9bde54e36674e424eb945ee9a4134f00
2018-05-02[automerger] Revert "mm-video-v4l2: Protect buffer access and increase input ↵Android Build Merger (Role)
buffer size" am: e1dfe8f504 Change-Id: I8a74cb0a3f34a5ce70ef3540f06747b5582a3713
2018-05-02Revert "mm-video-v4l2: Protect buffer access and increase input buffer size"Ray Essick
This reverts commit fd2e438d1b2cff89a3150e575e77341a7f01679e. Reason for revert: regression failures on oc-mr1/bullhead Change-Id: Ifd50946f0cdbf068ff7bb9fc46f8f1254d196ace Bug: 64340487 Bug: 78291359 Bug: 78913375 Merged-In: I800e3da4f056fe37be23a7a2567171f42c92e4a6 Merged-In: I9db2e2592600137151d0e3f86f6b6dc2f03a950d Merged-In: Ibd1ed01c7d740553b3cf90b6f3dd2fd447563284 Merged-In: I1763963839375db90f76dd0022bd1767ac5f067d Merged-In: I69398d4fb236289be5f0b79f8db9a3bc30144b90 Merged-In: Ie9caad90482698913db06cdb9aeebfd869fe1a6a
2018-05-02[automerger skipped] Revert "mm-video-v4l2: Protect buffer access and ↵Android Build Merger (Role)
increase input buffer size" skipped: 2e2293b82e skipped: 5d8ba5e98f skipped: 76637d6380 skipped: 525005edf5 skipped: 229feaed1a Change-Id: Ia0ba0510f24ef638837ebc159f0d561393116dd9
2018-05-02[automerger skipped] Revert "mm-video-v4l2: Protect buffer access and ↵Android Build Merger (Role)
increase input buffer size" skipped: 2e2293b82e skipped: 5d8ba5e98f skipped: 76637d6380 skipped: 525005edf5 Change-Id: I1bdc481172c840e2ddf3ebeeba14cd972b172c6e
2018-05-02[automerger skipped] Revert "mm-video-v4l2: Protect buffer access and ↵Android Build Merger (Role)
increase input buffer size" skipped: 2e2293b82e skipped: 5d8ba5e98f skipped: 76637d6380 Change-Id: I7b1dbcd98ac66531ef1e8a12db96c8b8961a2e53
2018-05-02[automerger skipped] Revert "mm-video-v4l2: Protect buffer access and ↵Android Build Merger (Role)
increase input buffer size" skipped: 2e2293b82e skipped: 5d8ba5e98f Change-Id: I75e60146e18c26386303f10cc7854dc8ab271175
2018-05-02[automerger skipped] Revert "mm-video-v4l2: Protect buffer access and ↵Android Build Merger (Role)
increase input buffer size" skipped: 2e2293b82e Change-Id: I0c76ae74953ef580608f92d3e49f5fe21c713959
2018-05-02Revert "mm-video-v4l2: Protect buffer access and increase input buffer size"Ray Essick
This reverts commit 3f5de9fcd5c9653446ec8d4cb6b1c39536485ee5. Reason for revert: regression at oc-mr1/bullhead Change-Id: I800e3da4f056fe37be23a7a2567171f42c92e4a6 Bug: 64340487 Bug: 78291359 Bug: 78913375 Merged-In: I9db2e2592600137151d0e3f86f6b6dc2f03a950d Merged-In: Ibd1ed01c7d740553b3cf90b6f3dd2fd447563284 Merged-In: I1763963839375db90f76dd0022bd1767ac5f067d Merged-In: I69398d4fb236289be5f0b79f8db9a3bc30144b90 Merged-In: Ie9caad90482698913db06cdb9aeebfd869fe1a6a
2018-05-02[automerger] Revert "mm-video-v4l2: Protect buffer access and increase input ↵Android Build Merger (Role)
buffer size" am: b2255366c0 am: 188d112d9c am: f990c7a4c9 am: 7f917145d0 Change-Id: Iec18664f02adeaf4338223b79848faa6bd2a6736
2018-05-02[automerger] Revert "mm-video-v4l2: Protect buffer access and increase input ↵Android Build Merger (Role)
buffer size" am: b2255366c0 am: 188d112d9c am: f990c7a4c9 Change-Id: Iea6869fe2f28aa6b628d300fdcf4ac2c96b0de0f
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-24 22:53:47 +0000