summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-10-21Merge "Replace is-vendor-board-platform with is-vendor-board-qcom." am: ↵t_frc_tz4_330443010t_frc_swc_330443040t_frc_swc_330443010t_frc_sta_330443010t_frc_sch_330443040t_frc_sch_330443010t_frc_res_330443000t_frc_per_330444010t_frc_odp_330442040t_frc_odp_330442000t_frc_neu_330443030t_frc_neu_330443000t_frc_net_330443000t_frc_med_330443030t_frc_ips_330443010t_frc_ext_330443000t_frc_doc_330543000t_frc_doc_330443060t_frc_doc_330443000t_frc_con_330443020t_frc_cbr_330443000t_frc_ase_330444010t_frc_art_330443060t_frc_adb_330444000frc_340821000frc_340819280frc_340819220frc_340819190frc_340819030frc_340819020frc_340819010frc_340818170frc_340818110android-vts-14.0_r4android-vts-14.0_r3android-vts-14.0_r2android-vts-14.0_r1android-u-beta-1-gplandroid-security-14.0.0_r8android-security-14.0.0_r7android-security-14.0.0_r6android-security-14.0.0_r5android-security-14.0.0_r4android-security-14.0.0_r3android-security-14.0.0_r2android-security-14.0.0_r1android-platform-14.0.0_r7android-platform-14.0.0_r6android-platform-14.0.0_r5android-platform-14.0.0_r4android-platform-14.0.0_r3android-platform-14.0.0_r2android-platform-14.0.0_r1android-cts-14.0_r4android-cts-14.0_r3android-cts-14.0_r2android-cts-14.0_r1android-14.0.0_r9android-14.0.0_r8android-14.0.0_r7android-14.0.0_r6android-14.0.0_r5android-14.0.0_r45android-14.0.0_r44android-14.0.0_r43android-14.0.0_r42android-14.0.0_r41android-14.0.0_r40android-14.0.0_r4android-14.0.0_r39android-14.0.0_r38android-14.0.0_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r3android-14.0.0_r29android-14.0.0_r28android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r2android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16android-14.0.0_r15android-14.0.0_r14android-14.0.0_r13android-14.0.0_r12android-14.0.0_r11android-14.0.0_r10android-14.0.0_r1android-13.0.0_r83android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android-13.0.0_r57android-13.0.0_r56android-13.0.0_r55android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android-13.0.0_r49android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32android-13.0.0_r30android-13.0.0_r29android-13.0.0_r28android-13.0.0_r27android-13.0.0_r24android-13.0.0_r23android-13.0.0_r22android-13.0.0_r21android-13.0.0_r20android-13.0.0_r19android-13.0.0_r18android-13.0.0_r17android-13.0.0_r16aml_uwb_341513070aml_uwb_341511050aml_uwb_341310300aml_uwb_341310030aml_uwb_341111010aml_uwb_341011000aml_uwb_331910010aml_uwb_331820070aml_uwb_331613010aml_uwb_331611010aml_uwb_331410010aml_uwb_331310030aml_uwb_331115000aml_uwb_331015040aml_uwb_330810010aml_tz5_341510070aml_tz5_341510050aml_tz5_341510010aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000aml_sch_341510000aml_sch_331113000aml_sch_331111000aml_rkp_341510000aml_rkp_341311000aml_rkp_341114000aml_rkp_341015010aml_rkp_341012000aml_odp_341610000aml_net_341610030aml_net_341510050aml_net_341510000aml_net_341411030aml_net_341311010aml_net_341310020aml_net_341014000aml_net_340913000aml_net_331910030aml_net_331812010aml_net_331710000aml_net_331610000aml_net_331412000aml_net_331313030aml_net_331313010aml_net_331110020aml_net_331011030aml_net_330910010aml_net_330811010aml_hef_341613000aml_hef_341512030aml_hef_341415040aml_hef_341311010aml_hef_341114030aml_go_wif_330911000aml_go_uwb_330912000aml_go_tz4_330912000aml_go_tet_330914010aml_go_swc_330913000aml_go_sta_330911000aml_go_sdk_330810000aml_go_sch_330911000aml_go_res_330912000aml_go_per_330912000aml_go_odp_330913000aml_go_odp_330912000aml_go_neu_330912000aml_go_net_330913000aml_go_mpr_330912000aml_go_med_330913000aml_go_ips_330911000aml_go_ext_330912000aml_go_doc_330912000aml_go_con_330913000aml_go_cbr_330912000aml_go_ase_330913000aml_go_art_330913000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000aml_go_adb_330913000aml_cfg_341510000aml_ase_341510000aml_ase_341410000aml_ase_341310010aml_ase_341113000aml_ase_340913000aml_ase_331311020aml_ase_331112000aml_ase_331011020aml_art_341615020aml_art_341514450aml_art_341514410aml_art_341411300aml_art_341311100aml_art_341110110aml_art_341110060aml_art_341010050aml_art_340915060aml_art_331813100aml_art_331813010aml_art_331711080aml_art_331612010aml_art_331413030aml_art_331314010aml_art_331113000aml_art_331012050aml_ads_341615050aml_ads_341517040aml_ads_341413000aml_ads_341316030aml_ads_341131050aml_ads_341027030aml_ads_340915050aml_ads_331920180aml_ads_331814200aml_ads_331710270aml_ads_331611190aml_ads_331511020aml_ads_331418080aml_ads_331131000main-16k-with-phonesmain-16kandroid14-tests-releaseandroid14-security-releaseandroid14-s2-releaseandroid14-s1-releaseandroid14-releaseandroid14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-releaseandroid14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-platform-releaseandroid14-mainline-uwb-releaseandroid14-mainline-networking-releaseandroid14-mainline-healthfitness-releaseandroid14-mainline-art-releaseandroid14-mainline-appsearch-releaseandroid14-mainline-adservices-releaseandroid14-gsiandroid14-devandroid14-d2-s5-releaseandroid14-d2-s4-releaseandroid14-d2-s3-releaseandroid14-d2-s2-releaseandroid14-d2-s1-releaseandroid14-d2-releaseandroid14-d1-s7-releaseandroid14-d1-s6-releaseandroid14-d1-s5-releaseandroid14-d1-s4-releaseandroid14-d1-s3-releaseandroid14-d1-s2-releaseandroid14-d1-s1-releaseandroid14-d1-releaseandroid13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-releaseandroid13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseandroid13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseandroid13-qpr1-s8-releaseandroid13-qpr1-s7-releaseandroid13-qpr1-s6-releaseandroid13-qpr1-s5-releaseandroid13-qpr1-s4-releaseandroid13-qpr1-s3-releaseandroid13-qpr1-s2-releaseandroid13-qpr1-s1-releaseandroid13-qpr1-releaseandroid13-mainline-uwb-releaseandroid13-mainline-tzdata4-releaseandroid13-mainline-scheduling-releaseandroid13-mainline-networking-releaseandroid13-mainline-go-wifi-releaseandroid13-mainline-go-uwb-releaseandroid13-mainline-go-tzdata4-releaseandroid13-mainline-go-tethering-releaseandroid13-mainline-go-sdkext-releaseandroid13-mainline-go-scheduling-releaseandroid13-mainline-go-resolv-releaseandroid13-mainline-go-permission-releaseandroid13-mainline-go-os-statsd-releaseandroid13-mainline-go-odp-releaseandroid13-mainline-go-neuralnetworks-releaseandroid13-mainline-go-networking-releaseandroid13-mainline-go-mediaprovider-releaseandroid13-mainline-go-media-swcodec-releaseandroid13-mainline-go-media-releaseandroid13-mainline-go-ipsec-releaseandroid13-mainline-go-extservices-releaseandroid13-mainline-go-documentsui-releaseandroid13-mainline-go-conscrypt-releaseandroid13-mainline-go-cellbroadcast-releaseandroid13-mainline-go-art-releaseandroid13-mainline-go-appsearch-releaseandroid13-mainline-go-adservices-releaseandroid13-mainline-go-adbd-releaseandroid13-mainline-art-releaseandroid13-mainline-appsearch-releaseandroid13-mainline-adservices-releaseandroid13-frc-scheduling-releaseandroid13-frc-resolv-releaseandroid13-frc-permission-releaseandroid13-frc-os-statsd-releaseandroid13-frc-odp-releaseandroid13-frc-neuralnetworks-releaseandroid13-frc-networking-releaseandroid13-frc-media-swcodec-releaseandroid13-frc-media-releaseandroid13-frc-ipsec-releaseandroid13-frc-extservices-releaseandroid13-frc-documentsui-releaseandroid13-frc-conscrypt-releaseandroid13-frc-cellbroadcast-releaseandroid13-frc-art-releaseandroid13-frc-adbd-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-releaseandroid13-d2-releaseaml_tz5_341510010aml_tz4_332714010Treehugger Robot
6ce9105f28 am: c64edd1cea am: 0d1976035c am: 327b012a75 am: 02d59b2565 Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/camera/+/1866334 Change-Id: I49b64b6ea25d8ba0920277139cad6434d20d21c4
2021-10-21Merge "Replace is-vendor-board-platform with is-vendor-board-qcom." am: ↵Treehugger Robot
6ce9105f28 am: c64edd1cea am: 0d1976035c am: 327b012a75 Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/camera/+/1866334 Change-Id: I85f2bc8eed6d2406a0448dce17cd9f7f42aa78cc
2021-10-21Merge "Replace is-vendor-board-platform with is-vendor-board-qcom." am: ↵android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Treehugger Robot
6ce9105f28 am: c64edd1cea am: 0d1976035c Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/camera/+/1866334 Change-Id: Ib96f6f3824ac6def9001797b2e89db8b5d6e18f2
2021-10-21Merge "Replace is-vendor-board-platform with is-vendor-board-qcom." am: ↵Treehugger Robot
6ce9105f28 am: c64edd1cea Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/camera/+/1866334 Change-Id: I2e99982c929d84f061b441cfa73cf9b3eac05cc0
2021-10-21Merge "Replace is-vendor-board-platform with is-vendor-board-qcom." am: ↵Treehugger Robot
6ce9105f28 Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/camera/+/1866334 Change-Id: I7900a48421dbc6f8ac4d074af8d51aae1c49fa60
2021-10-21Merge "Replace is-vendor-board-platform with is-vendor-board-qcom."android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1Treehugger Robot
2021-10-20Replace is-vendor-board-platform with is-vendor-board-qcom.Sasha Smundak
Bug: 201477826 Test: treehugger This change has been generated by the following script: ``` #! /bin/bash declare -r files="$(grep -rlP '^[^#]*call +is-vendor-board-platform' --include '*.mk')" [[ -z "$files" ]] || sed -i -r -f <(cat <<"EOF" s/ifeq \(\$\(call is-vendor-board-platform,QCOM\),true\)/ifneq (,$(call is-vendor-board-qcom))/ s/ifneq \(\$\(call is-vendor-board-platform,QCOM\),true\)/ifeq (,$(call is-vendor-board-qcom))/ EOF ) $files ``` Change-Id: I8e56fdb17619de35ae80d94de3ae5dfd1d1194e8
2021-08-27Merge "Remove ndk_platform backend. Use the ndk backend." am: e04cd9a837 am: ↵Steven Moreland
68e387b752 am: 255858721a am: d96a7e85d5 am: 47e2e0007b Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/camera/+/1788176 Change-Id: I93b0a39e5b1b7d4be81449156f539b61b25f4a35
2021-08-27Merge "Remove ndk_platform backend. Use the ndk backend." am: e04cd9a837 am: ↵Steven Moreland
68e387b752 am: 255858721a am: d96a7e85d5 Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/camera/+/1788176 Change-Id: Ife28f5cf6fbeb32a91126c20d808fb5979694267
2021-08-25Merge "Remove ndk_platform backend. Use the ndk backend." am: e04cd9a837 am: ↵Steven Moreland
68e387b752 am: 255858721a Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/camera/+/1788176 Change-Id: Ia555752acfc694dc6b7445d2bd6827de09e8c09e
2021-08-25Merge "Remove ndk_platform backend. Use the ndk backend." am: e04cd9a837 am: ↵Steven Moreland
68e387b752 Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/camera/+/1788176 Change-Id: I5bf345dd2290286124dee844f2b8f140741cb338
2021-08-25Merge "Remove ndk_platform backend. Use the ndk backend." am: e04cd9a837Steven Moreland
Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/camera/+/1788176 Change-Id: I1fbbc82f480b4a1c8c66e192e7bc9ad1ea720688
2021-08-25Merge "Remove ndk_platform backend. Use the ndk backend."android-s-beta-5android-s-beta-5Steven Moreland
2021-08-09Remove ndk_platform backend. Use the ndk backend.Jiyong Park
The ndk_platform backend will soon be deprecated because the ndk backend can serve the same purpose. This is to eliminate the confusion about having two variants (ndk and ndk_platform) for the same ndk backend. Bug: 161456198 Test: m Change-Id: I1f37e930a1fba1d35e79c67d64f5d0894d4082e0
2021-08-06Remove ndk_platform backend. Use the ndk backend.Jiyong Park
The ndk_platform backend will soon be deprecated because the ndk backend can serve the same purpose. This is to eliminate the confusion about having two variants (ndk and ndk_platform) for the same ndk backend. Bug: 161456198 Test: m Change-Id: I72b3e894dc5553459ec13feb4a445837eab24b53
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: f79356d1c9 -s ↵Xin Li
ours am: 872ec7ecd3 -s ours am: 7a9d8944fa -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: If4b6e696d36bac387d3433de422d221aac628403
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 am: db18083395 Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/camera/+/1589293 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0532be900b45eeca7841fd79ac2db69cabac3e59
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 am: cf4c392263 Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/camera/+/1576110 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I16ad232198724d3e4f59db67a9f8205aef3407d0
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-18 13:44:00 +0000