summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: f79356d1c9 -s ↵android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devXin Li
ours am: 872ec7ecd3 -s ours am skip reason: Change-Id I82289538a93fd6f749aa6825a5ce93d989e21d1d with SHA-1 ef55f31eef is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4fa53a531032e96e345fc2f0a2526d5497188872
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: f79356d1c9 -s oursXin Li
am skip reason: Change-Id I82289538a93fd6f749aa6825a5ce93d989e21d1d with SHA-1 ef55f31eef is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ife6c08e686cde1e295e042dc97de520dc46dc495
2021-02-20Mark ab/7061308 as merged in stage.android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-4Xin Li
Bug: 180401296 Merged-In: I82289538a93fd6f749aa6825a5ce93d989e21d1d Change-Id: I15e878a953ed2eda639d1d19d041df25d8a3dbb4
2021-02-15Merge "Specify version for aidl_interface explicitly" am: f07d4c925c am: ↵Treehugger Robot
dce5d5c7cf am: 5e41e81f3a Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/camera/+/1589293 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie736b9017b75567bc3818235f3a3d289e5e9858d
2021-02-15Merge "Specify version for aidl_interface explicitly" am: f07d4c925c am: ↵Treehugger Robot
dce5d5c7cf Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/camera/+/1589293 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I21daa58782e57dc343edd962a4108345a096886b
2021-02-15Merge "Specify version for aidl_interface explicitly" am: f07d4c925cTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/camera/+/1589293 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5cff4768f21a455ca65e1907796d832688726b15
2021-02-15Merge "Specify version for aidl_interface explicitly"android-s-preview-1Treehugger Robot
2021-02-15Specify version for aidl_interface explicitlyJeongik Cha
Bug: 150578172 Test: m Change-Id: I644d1db8db535e00698d45e70faa3bda93632381
2021-02-05Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/camera" am: 7ed1a29f66 ↵Bob Badour
am: 88346b64b4 am: 3c060997c4 Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/camera/+/1576110 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If8016f076b5c623e0dc1da0a190444a6a1b18e1d
2021-02-05Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/camera" am: 7ed1a29f66 ↵Bob Badour
am: 88346b64b4 Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/camera/+/1576110 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5d29ab5c545efc7eedf6721e4b3e605957fc5f34
2021-02-05Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/camera" am: 7ed1a29f66Bob Badour
Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/camera/+/1576110 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I33bff6ac1d2dff4458bb99962130e84ff6866f4d
2021-02-05Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/camera"Bob Badour
2021-02-05[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/cameraBob Badour
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD to: msm8998/QCamera2/stack/mm-camera-test/Android.mk Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD legacy_not_a_contribution to: msm8998/QCamera2/Android.mk Added SPDX-license-identifier-BSD to: msm8998/QCamera2/HAL/test/Android.mk msm8998/QCamera2/HAL3/test/Android.mk msm8998/QCamera2/stack/mm-camera-interface/Android.mk msm8998/QCamera2/stack/mm-jpeg-interface/Android.mk msm8998/QCamera2/stack/mm-jpeg-interface/test/Android.mk msm8998/QCamera2/stack/mm-lib2d-interface/Android.mk msm8998/QCamera2/stack/mm-lib2d-interface/test/Android.mk msm8998/mm-image-codec/qomx_core/Android.mk Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I5a70367a9a9e9695cc3ecc67566841283d4e97da
2020-11-25Mark ab/6881855 as merged am: 4bbcc843df am: ef55f31eefXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/camera/+/13112971 Change-Id: Ifee118d5123957c4294594b6f7534e9155f81969
2020-11-25Mark ab/6881855 as merged am: 4bbcc843dfXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/camera/+/13112971 Change-Id: I82289538a93fd6f749aa6825a5ce93d989e21d1d
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: I1e31c49f778f39acb31de33b1243c9a267b39ef8
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 635a8b3ace -s ours am: ↵Xin Li
4d95ba81ee -s ours am: 42cc3d3e6e -s ours am skip reason: Change-Id Ic1fab99f1ec3b41e57f10af9231aac00ef7fc5ca with SHA-1 21e66a8d66 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/camera/+/12796870 Change-Id: I7a4c6d1f8602829c6b73c531e8a816781c5eb989
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 635a8b3ace -s ours am: ↵Xin Li
4d95ba81ee -s ours am skip reason: Change-Id Ic1fab99f1ec3b41e57f10af9231aac00ef7fc5ca with SHA-1 21e66a8d66 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/camera/+/12796870 Change-Id: I13dc73ee1ade24465abf571cee8ad65a1ab9b61d
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 635a8b3ace -s oursXin Li
am skip reason: Change-Id Ic1fab99f1ec3b41e57f10af9231aac00ef7fc5ca with SHA-1 21e66a8d66 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/camera/+/12796870 Change-Id: Id0b2a92ec13279979595f4a4c8ad40176d4d6439
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: Ic1fab99f1ec3b41e57f10af9231aac00ef7fc5ca Change-Id: Ie9a209bc5e2c13c0da0178c76adcc920723dc4f7
2020-09-13QCamera2: HAL3: Fix ERROR_REQUEST/ERROR_BUFFER bugs am: 6777bc3ddc am: ↵Shuzhen Wang
94daee85ee Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/camera/+/11535022 Change-Id: Ie5ab572cad40d85e7cca1f841ceba9c33f4dcb5c
2020-09-11[automerger skipped] Merge "Merge Android R" am: 251f430d51 -s ours am: ↵Xin Li
3193e4c719 -s ours am: 7c89c7cd82 -s ours am: cf7bc20525 -s ours am: 63bf3a19c8 -s ours am skip reason: Change-Id I7f1093c37003f7b757dac9c77f191813e5b01e2a with SHA-1 de73fb37cb is in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/camera/+/1422437 Change-Id: I9d710983bf14f55b9cc304b1f6f9550068a1c111
2020-09-11[automerger skipped] Merge "Merge Android R" am: 251f430d51 -s ours am: ↵Xin Li
3193e4c719 -s ours am: 7c89c7cd82 -s ours am: cf7bc20525 -s ours am skip reason: Change-Id I7f1093c37003f7b757dac9c77f191813e5b01e2a with SHA-1 de73fb37cb is in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/camera/+/1422437 Change-Id: I726bdd74aa06809d72aa119e7f79716d93939a37
2020-09-11[automerger skipped] Merge "Merge Android R" am: 251f430d51 -s ours am: ↵Xin Li
3193e4c719 -s ours am: 7c89c7cd82 -s ours am skip reason: Change-Id I7f1093c37003f7b757dac9c77f191813e5b01e2a with SHA-1 de73fb37cb is in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/camera/+/1422437 Change-Id: I42a896b1df305012dae418448d5d2cbe2314e92c
2020-09-11[automerger skipped] Merge "Merge Android R" am: 251f430d51 -s ours am: ↵Xin Li
3193e4c719 -s ours am skip reason: Change-Id I7f1093c37003f7b757dac9c77f191813e5b01e2a with SHA-1 de73fb37cb is in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/camera/+/1422437 Change-Id: Ic8cf105dd45ecb92917ebfe5f49ee7091009b1d0
2020-09-11[automerger skipped] Merge "Merge Android R" am: 251f430d51 -s oursXin Li
am skip reason: Change-Id I7f1093c37003f7b757dac9c77f191813e5b01e2a with SHA-1 de73fb37cb is in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/camera/+/1422437 Change-Id: Idc36e91ad48d16e9bbba42cae88c3e8a9ed0b955
2020-09-10Merge "Merge Android R"Xin Li
2020-09-08Merge Android RXin Li
Bug: 168057903 Merged-In: I7f1093c37003f7b757dac9c77f191813e5b01e2a Change-Id: I0b6b42688e415b4016f2a61123d6d17f89e95e7f
2020-09-02[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: de73fb37cb -s ours am: b829dde375 -s ours am: f9645c493d -s ours am: e14dcc9c14 -s ours am skip reason: Change-Id Ie13f04e1174ba7eb158c8fb4d3321a77ea090f49 with SHA-1 8d17e5212d is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/camera/+/12470212 Change-Id: I66d29ddc91a590e7f4666b9eb46edf591c55a3ba
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: de73fb37cb -s ours am: b829dde375 -s ours am: f9645c493d -s ours am skip reason: Change-Id Ie13f04e1174ba7eb158c8fb4d3321a77ea090f49 with SHA-1 8d17e5212d is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/camera/+/12470212 Change-Id: Ib6dcdb7cc1736963c408287a56c197d3f515280f
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: de73fb37cb -s ours am: b829dde375 -s ours am skip reason: Change-Id Ie13f04e1174ba7eb158c8fb4d3321a77ea090f49 with SHA-1 8d17e5212d is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/camera/+/12470212 Change-Id: Iafe76a90ba4f837ef1b1c0e1377051d164d9fb6a
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: de73fb37cb -s ours am skip reason: Change-Id Ie13f04e1174ba7eb158c8fb4d3321a77ea090f49 with SHA-1 8d17e5212d is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/camera/+/12470212 Change-Id: Ibfbd350735caf8db28a401b21b000511458a18d0
2020-08-27Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)temp_sam_168057903Xin Li
Bug: 166295507 Merged-In: Ie13f04e1174ba7eb158c8fb4d3321a77ea090f49 Change-Id: I7f1093c37003f7b757dac9c77f191813e5b01e2a
2020-06-08[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: ↵Xin Li
3e6a4459d0 -s ours am: cce9738296 -s ours am: 8d17e5212d -s ours am: 21e66a8d66 -s ours am: 28cb90171f -s ours am skip reason: Change-Id I7fe9d15b49fd2c43428e007d2af0e18a4fbf36fa with SHA-1 e3f027d5aa is in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/camera/+/1323619 Change-Id: I982eb6596852e9de8c7b7684aa5ed457029cc0e4
2020-06-08[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: ↵Xin Li
3e6a4459d0 -s ours am: cce9738296 -s ours am: 8d17e5212d -s ours am: 21e66a8d66 -s ours am skip reason: Change-Id I7fe9d15b49fd2c43428e007d2af0e18a4fbf36fa with SHA-1 e3f027d5aa is in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/camera/+/1323619 Change-Id: I466f220b640c18081cac930a89a10e05686ea747
2020-06-08[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: ↵Xin Li
3e6a4459d0 -s ours am: cce9738296 -s ours am: 8d17e5212d -s ours am skip reason: Change-Id I7fe9d15b49fd2c43428e007d2af0e18a4fbf36fa with SHA-1 e3f027d5aa is in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/camera/+/1323619 Change-Id: Ic1fab99f1ec3b41e57f10af9231aac00ef7fc5ca
2020-06-08[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: ↵Xin Li
3e6a4459d0 -s ours am: cce9738296 -s ours am skip reason: Change-Id I7fe9d15b49fd2c43428e007d2af0e18a4fbf36fa with SHA-1 e3f027d5aa is in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/camera/+/1323619 Change-Id: Ie13f04e1174ba7eb158c8fb4d3321a77ea090f49
2020-06-08[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: ↵Xin Li
3e6a4459d0 -s ours am skip reason: Change-Id I7fe9d15b49fd2c43428e007d2af0e18a4fbf36fa with SHA-1 e3f027d5aa is in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/camera/+/1323619 Change-Id: Id0b2f89e98ea01d16b888d1615a6f6ab97cff981
2020-06-06Merge "Merge QQ3A.200605.002 into master"android-r-beta-3android-r-beta-2Xin Li
2020-06-03Merge QQ3A.200605.002 into masterXin Li
Bug: 158095402 Merged-In: I7fe9d15b49fd2c43428e007d2af0e18a4fbf36fa Change-Id: Ibca7d8b2c3fe091ca4e0212639a86fe739860304
2020-05-21QCamera2: HAL3: Fix ERROR_REQUEST/ERROR_BUFFER bugs am: 6777bc3ddc am: ↵Shuzhen Wang
b32265b1f0 am: 2e307b14ca am: 42d3a8f77f Change-Id: Ib906c1c2a1c9cceea0546cd2842f0b48fad68895
2020-05-21QCamera2: HAL3: Fix ERROR_REQUEST/ERROR_BUFFER bugs am: 6777bc3ddc am: ↵Shuzhen Wang
a19eb7e545 am: 8c04826211 am: 18f05bf2a0 Change-Id: I91fb7b740c668ef3c7e39be7e58ecb62ce5e4f7e
2020-05-21QCamera2: HAL3: Fix ERROR_REQUEST/ERROR_BUFFER bugs am: 6777bc3ddc am: ↵Shuzhen Wang
a19eb7e545 am: 28d813dc10 am: ea65a0830b Change-Id: I39cb1e739c544d2347d1d0a91b2c04dc15eee06e
2020-05-21QCamera2: HAL3: Fix ERROR_REQUEST/ERROR_BUFFER bugs am: 6777bc3ddc am: ↵Shuzhen Wang
b32265b1f0 am: 2e307b14ca Change-Id: I8919a573669a352d5e456393d8a15d6754719d97
2020-05-21QCamera2: HAL3: Fix ERROR_REQUEST/ERROR_BUFFER bugs am: 6777bc3ddc am: ↵Shuzhen Wang
a19eb7e545 am: 8c04826211 Change-Id: Ibbc2d5de880224b30d053f54ce281ecb6c16b86c
2020-05-21QCamera2: HAL3: Fix ERROR_REQUEST/ERROR_BUFFER bugs am: 6777bc3ddc am: ↵Shuzhen Wang
a19eb7e545 am: 28d813dc10 Change-Id: Ic9f24c4a01f5346712af29f8b2ddf93299fc5c1a
2020-05-21QCamera2: HAL3: Fix ERROR_REQUEST/ERROR_BUFFER bugs am: 6777bc3ddc am: ↵Shuzhen Wang
b32265b1f0 Change-Id: I640fc2ebc0285157ac754ea200952ecae894e804
2020-05-21QCamera2: HAL3: Fix ERROR_REQUEST/ERROR_BUFFER bugs am: 6777bc3ddc am: ↵android-11.0.0_r48android-11.0.0_r47android-11.0.0_r46android-11.0.0_r45android-11.0.0_r44android-11.0.0_r43android-11.0.0_r42android-11.0.0_r41android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android-11.0.0_r31android-11.0.0_r30android-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_r18android11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-releaseandroid11-qpr1-c-releaseandroid11-d2-releaseShuzhen Wang
a19eb7e545 Change-Id: I5fe0d2ba70a48ec01aaefbdb5b50730bd621e79c
2020-05-21QCamera2: HAL3: Fix ERROR_REQUEST/ERROR_BUFFER bugs am: 6777bc3ddc am: ↵Shuzhen Wang
a19eb7e545 Change-Id: I23a444461f96ce2ea554de367034d977b4bfa90d
2020-05-21QCamera2: HAL3: Fix ERROR_REQUEST/ERROR_BUFFER bugs am: 6777bc3ddcandroid-mainline-12.0.0_r112android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12aml_tz2_305400500aml_tz2_305400300aml_tz2_305400100aml_tz2_304500300aml_tz2_303900110aml_tz2_303900102aml_tz2_303800002aml_tz2_303800001aml_tz2_303200001android12-mainline-tzdata2-releaseandroid11-mainline-tethering-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseaml_tz2_305400100Shuzhen Wang
Change-Id: I9c3e4d75d81fd2382bf9da695295440ed86a8e21
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-02 02:59:11 +0000