summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-11-17[automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am: ↵HEADt_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_r1android-platform-13.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_331131000mastermain-16k-with-phonesmain-16kmainandroid14-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-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-platform-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_332714010Xin Li
545f2961b6 -s ours am: 7e248745a2 -s ours am: f9244ffc20 -s ours am skip reason: Merged-In Ie1510b730a4c573b8e3d970bb3f04d6c4d94e90e with SHA-1 9553356090 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm8150/media/+/16276065 Change-Id: I5288bb3c5d77e666a8a0a5d3d3e34eb4ef314c8f
2021-11-17[automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am: ↵Xin Li
545f2961b6 -s ours am: 7e248745a2 -s ours am skip reason: Merged-In Ie1510b730a4c573b8e3d970bb3f04d6c4d94e90e with SHA-1 9553356090 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm8150/media/+/16276065 Change-Id: I9bc8f4644d7341ed3dd88d989d247ec25f467e86
2021-11-17[automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am: ↵Xin Li
545f2961b6 -s ours am skip reason: Merged-In Ie1510b730a4c573b8e3d970bb3f04d6c4d94e90e with SHA-1 9553356090 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm8150/media/+/16276065 Change-Id: I4a6401fd08e86e510f7d3a6b5842e0c5b2671d0c
2021-11-10Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918android-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-1Xin Li
Bug: 205056467 Merged-In: Ie1510b730a4c573b8e3d970bb3f04d6c4d94e90e Change-Id: Ic9b9344401235f2b056a7fdd0ac97f8ee1666e07
2021-11-05Replace is-board-platform[-in-list] with is-board-platform[-in-list]2 am: ↵Sasha Smundak
b06283cbf2 am: 2f65600922 am: 9058a418bd am: a3c81c6318 am: 3d1b99f213 Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sm8150/media/+/1871919 Change-Id: I474657cc94992c30b2d7a78fbdc98e3fbacd6833
2021-11-05Replace is-board-platform[-in-list] with is-board-platform[-in-list]2 am: ↵Sasha Smundak
b06283cbf2 am: 2f65600922 am: 9058a418bd am: a3c81c6318 Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sm8150/media/+/1871919 Change-Id: Ib04f702d0ca48e34e98fad68b4aaf2efd8c533f6
2021-11-05Replace is-board-platform[-in-list] with is-board-platform[-in-list]2 am: ↵Sasha Smundak
b06283cbf2 am: 2f65600922 am: 9058a418bd Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sm8150/media/+/1871919 Change-Id: Ie65e78766450187f8ca8ea3c957799a5c82d9c7e
2021-11-05Replace is-board-platform[-in-list] with is-board-platform[-in-list]2 am: ↵Sasha Smundak
b06283cbf2 am: 2f65600922 Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sm8150/media/+/1871919 Change-Id: I6ec011b0eef51da758c36972d98c8666d98131d4
2021-11-05Replace is-board-platform[-in-list] with is-board-platform[-in-list]2 am: ↵Sasha Smundak
b06283cbf2 Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sm8150/media/+/1871919 Change-Id: Ib5b8e2520f06764f8c96fd595e58a3519422e45f
2021-10-28Replace is-board-platform[-in-list] with is-board-platform[-in-list]2Sasha Smundak
Bug: 201477826 Test: treehugger This change has been generated by the following script: ``` #! /bin/bash declare -r files="$(grep -rlP '^[^#]*call +is-board-platform' --include '*.mk' --exclude 'utils_test.mk' --exclude 'utils_sample_usage.mk')" [[ -z "$files" ]] || sed -i -r -f <(cat <<"EOF" s/ifeq +\(\$\(call is-board-platform,(.*)\), *true\)/ifneq (,$(call is-board-platform2,\1))/ s/ifeq +\(\$\(call is-board-platform,(.*)\), *\)/ifeq (,$(call is-board-platform2,\1))/ s/ifneq +\(\$\(call is-board-platform,(.*)\), *true\)/ifeq (,$(call is-board-platform2,\1))/ s/ifeq +\(\$\(call is-board-platform-in-list,(.*)\), *true\)/ifneq (,$(call is-board-platform-in-list2,\1))/ s/ifeq +\(\$\(call is-board-platform-in-list,(.*)\), *\)/ifeq (,$(call is-board-platform-in-list2,\1))/ s/ifeq +\(\$\(call is-board-platform-in-list,(.*)\), *false\)/ifeq (,T) # TODO: remove useless check/ s/ifneq +\(\$\(call is-board-platform-in-list,(.*)\), *true\)/ifeq (,$(call is-board-platform-in-list2,\1))/ s/\$\(call is-board-platform,(.*)\)/$(call is-board-platform2,\1)/ EOF ) $files ``` Change-Id: I7a0c90f8845b2204150ede0879fc5097b2e99b5f
2021-10-28[automerger skipped] Replace is-platform-sdk-version-at-least calls with ↵Sasha Smundak
checking IS_AT_LEAST_xxx. am: 0279581749 am: 1b56d1d264 -s ours am: 7fd0bd573f -s ours am: 71940a0e3b -s ours am: 7d4d1b44fd -s ours am skip reason: Merged-In I7982d7b7a99b1824e721843c168fe6c3736a5b86 with SHA-1 2decbcf680 is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sm8150/media/+/1867018 Change-Id: I8ea2eac36b643432c96d17128c23878c1a81db87
2021-10-28[automerger skipped] Replace is-platform-sdk-version-at-least calls with ↵Sasha Smundak
checking IS_AT_LEAST_xxx. am: 0279581749 am: 1b56d1d264 -s ours am: 7fd0bd573f -s ours am: 71940a0e3b -s ours am skip reason: Merged-In I7982d7b7a99b1824e721843c168fe6c3736a5b86 with SHA-1 2decbcf680 is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sm8150/media/+/1867018 Change-Id: Iaed230bf0cafbe140c98874640c0272708af2e1d
2021-10-28[automerger skipped] Replace is-platform-sdk-version-at-least calls with ↵Sasha Smundak
checking IS_AT_LEAST_xxx. am: 0279581749 am: 1b56d1d264 -s ours am: 7fd0bd573f -s ours am skip reason: Merged-In I7982d7b7a99b1824e721843c168fe6c3736a5b86 with SHA-1 2decbcf680 is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sm8150/media/+/1867018 Change-Id: I9467988ffbd9030d2d0c83ee2644ce657c95e3f3
2021-10-28[automerger skipped] Replace is-platform-sdk-version-at-least calls with ↵Sasha Smundak
checking IS_AT_LEAST_xxx. am: 0279581749 am: 1b56d1d264 -s ours am skip reason: Merged-In I7982d7b7a99b1824e721843c168fe6c3736a5b86 with SHA-1 2decbcf680 is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sm8150/media/+/1867018 Change-Id: I97713940cfb9e6f5d28cec01a3b9b7dbc6d88810
2021-10-28Replace is-platform-sdk-version-at-least calls with checking ↵Sasha Smundak
IS_AT_LEAST_xxx. am: 0279581749 Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sm8150/media/+/1867018 Change-Id: Idfc2c8375aa64c192f46fbbea4481f391aca414d
2021-10-21Replace is-platform-sdk-version-at-least calls with checking IS_AT_LEAST_xxx.Sasha Smundak
Bug: 201477826 Test: treehugger This change has been generated by the following script: ``` declare -r files="$(grep -rlP '^[^#]*call +is-platform-sdk-version-at-least' --include '*.mk')" [[ -z "$files" ]] || sed -i -r -f <(cat <<"EOF" s/^([^#]*ifn?eq) +\(\$\(call is-platform-sdk-version-at-least, *(16|17|18|19|20|21|22|23|24|25)\), *true\)/\1 \(T,T\) \# TODO: Obsolete, please remove/ s/^([^#]*)if(n?)eq +\(\$\(call is-platform-sdk-version-at-least, *26\), *true\)/\1if\2def IS_AT_LEAST_OPR1/ s/^([^#]*)if(n?)eq +\(\$\(call is-platform-sdk-version-at-least, *27\), *true\)/\1if\2def IS_AT_LEAST_OPM1/ s/^([^#]*)if(n?)eq +\(\$\(call is-platform-sdk-version-at-least, *28\), *true\)/\1if\2def IS_AT_LEAST_PPR1/ s/^([^#]*)if(n?)eq +\(\$\(call is-platform-sdk-version-at-least, *29\), *true\)/\1if\2def IS_AT_LEAST_QP1A/ s/^([^#]*)if(n?)eq +\(\$\(call is-platform-sdk-version-at-least, *30\), *true\)/\1if\2def IS_AT_LEAST_RP1A/ s/^([^#]*)if(n?)eq +\(\$\(call is-platform-sdk-version-at-least, *31\), *true\)/\1if\2def IS_AT_LEAST_SP1A/ EOF ) $files ``` Change-Id: I9af45f66d22c8f26f850d00926772d40884af763 Merged-In: I7982d7b7a99b1824e721843c168fe6c3736a5b86
2021-10-08[automerger skipped] Merge Android 12 am: eac700317a -s ours am: 13a29f3be1 ↵Xin Li
-s ours am: 26c51cf3a6 -s ours am: 9553356090 -s ours am: eebb368420 -s ours am skip reason: Merged-In Ifedfded14850aea33fbf981de40dca5e224d1515 with SHA-1 cf671612fb is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sm8150/media/+/1847612 Change-Id: I4d1710b74474f8bd11e4939fd63b2da63db2a913
2021-10-08[automerger skipped] Merge Android 12 am: eac700317a -s ours am: 13a29f3be1 ↵Xin Li
-s ours am: 26c51cf3a6 -s ours am: 9553356090 -s ours am skip reason: Merged-In Ifedfded14850aea33fbf981de40dca5e224d1515 with SHA-1 cf671612fb is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sm8150/media/+/1847612 Change-Id: I8ca67d63b1bce9decdaa969a2f3250a95836d235
2021-10-08[automerger skipped] Merge Android 12 am: eac700317a -s ours am: 13a29f3be1 ↵Xin Li
-s ours am: 26c51cf3a6 -s ours am skip reason: Merged-In Ifedfded14850aea33fbf981de40dca5e224d1515 with SHA-1 cf671612fb is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sm8150/media/+/1847612 Change-Id: Ie1510b730a4c573b8e3d970bb3f04d6c4d94e90e
2021-10-08[automerger skipped] Merge Android 12 am: eac700317a -s ours am: 13a29f3be1 ↵Xin Li
-s ours am skip reason: Merged-In Ifedfded14850aea33fbf981de40dca5e224d1515 with SHA-1 cf671612fb is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sm8150/media/+/1847612 Change-Id: Ief9405404010ff1f52dcd6ce60b8c8f40f162c8a
2021-10-08[automerger skipped] Merge Android 12 am: eac700317a -s oursXin Li
am skip reason: Merged-In Ifedfded14850aea33fbf981de40dca5e224d1515 with SHA-1 cf671612fb is already in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sm8150/media/+/1847612 Change-Id: I7e0ebabe8b2b9302512b402dcf2f906438453c99
2021-10-06Merge Android 12android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1Xin Li
Bug: 202323961 Merged-In: Ifedfded14850aea33fbf981de40dca5e224d1515 Change-Id: I731c73a9e838def82a71c9972a78b612bf45962e
2021-10-06Replace is-platform-sdk-version-at-least calls with checking ↵Sasha Smundak
IS_AT_LEAST_xxx. am: 2decbcf680 am: c196d22c21 am: ee833abf4f Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm8150/media/+/15975244 Change-Id: Ie0f42e6559f60a487bf6092fc759c7deeea8ffb8
2021-10-06Replace is-platform-sdk-version-at-least calls with checking ↵Sasha Smundak
IS_AT_LEAST_xxx. am: 2decbcf680 am: c196d22c21 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm8150/media/+/15975244 Change-Id: I7fc176cc15c429671dce9b688347c8541160c7c3
2021-10-06Replace is-platform-sdk-version-at-least calls with checking ↵Sasha Smundak
IS_AT_LEAST_xxx. am: 2decbcf680 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm8150/media/+/15975244 Change-Id: I31f3177dd56937734618f704b6f17546efc4c8d9
2021-10-04Replace is-platform-sdk-version-at-least calls with checking IS_AT_LEAST_xxx.Sasha Smundak
Bug: 201477826 Test: treehugger This change has been generated by the following script: ``` #! /bin/bash declare -r files="$(grep -rlP '^[^#]*call +is-platform-sdk-version-at-least' --include '*.mk')" [[ -z "$files" ]] || sed -i -r -f <(cat <<"EOF" s/^([^#]*ifn?eq) +\(\$\(call is-platform-sdk-version-at-least, *(16|17|18|19|20|21|22|23|24|25)\), *true\)/\1 \(T,T\) \# TODO: Obsolete, please remove/ s/^([^#]*)if(n?)eq +\(\$\(call is-platform-sdk-version-at-least, *26\), *true\)/\1if\2def IS_AT_LEAST_OPR1/ s/^([^#]*)if(n?)eq +\(\$\(call is-platform-sdk-version-at-least, *27\), *true\)/\1if\2def IS_AT_LEAST_OPM1/ s/^([^#]*)if(n?)eq +\(\$\(call is-platform-sdk-version-at-least, *28\), *true\)/\1if\2def IS_AT_LEAST_PPR1/ s/^([^#]*)if(n?)eq +\(\$\(call is-platform-sdk-version-at-least, *29\), *true\)/\1if\2def IS_AT_LEAST_QP1A/ s/^([^#]*)if(n?)eq +\(\$\(call is-platform-sdk-version-at-least, *30\), *true\)/\1if\2def IS_AT_LEAST_RP1A/ s/^([^#]*)if(n?)eq +\(\$\(call is-platform-sdk-version-at-least, *31\), *true\)/\1if\2def IS_AT_LEAST_SP1A/ EOF ) $files ``` Change-Id: I7982d7b7a99b1824e721843c168fe6c3736a5b86
2021-08-18[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
cf671612fb -s ours am: 29780c33fd -s ours am: 24050df649 -s ours am: 720583c4b3 -s ours am skip reason: Merged-In Ia185480829c5cd4e06853082845c848e2fa931c9 with SHA-1 471ae2ef73 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm8150/media/+/15571773 Change-Id: I4ab858a86f6a71a4b08cb671b815610d517d9f13
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
cf671612fb -s ours am: 29780c33fd -s ours am: 24050df649 -s ours am skip reason: Merged-In Ia185480829c5cd4e06853082845c848e2fa931c9 with SHA-1 471ae2ef73 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm8150/media/+/15571773 Change-Id: Ic57fa86f875dd8021edf44f1a23b6778dbff16c1
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
cf671612fb -s ours am: 29780c33fd -s ours am skip reason: Merged-In Ia185480829c5cd4e06853082845c848e2fa931c9 with SHA-1 471ae2ef73 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm8150/media/+/15571773 Change-Id: I6a89609e5240a83f415ad5f4c103a69683eb2dc7
2021-08-17[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: ↵Xin Li
cf671612fb -s ours am skip reason: Merged-In Ia185480829c5cd4e06853082845c848e2fa931c9 with SHA-1 471ae2ef73 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm8150/media/+/15571773 Change-Id: I8c0e1edbbaeb4daa5d0762b215871ab07436a842
2021-08-14Merge sc-dev-plus-aosp-without-vendor@7634622temp_sam_202323961Xin Li
Merged-In: Ia185480829c5cd4e06853082845c848e2fa931c9 Change-Id: Ifedfded14850aea33fbf981de40dca5e224d1515
2021-06-25Merge remote-tracking branch ↵Wilson Sung
'goog/qcom/release/LA.UM.9.1.C11.11.00.00.841.013' into sc-dev am: eb9f4d24af am: 471ae2ef73 am: bd7563387d Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm8150/media/+/14701713 Change-Id: I6b04cbadbd2eaa5dd6ccd1c9d4906a72c9774117
2021-06-25Merge remote-tracking branch ↵Wilson Sung
'goog/qcom/release/LA.UM.9.1.C11.11.00.00.841.013' into sc-dev am: eb9f4d24af am: 4f33ec60e1 am: b030e4be71 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm8150/media/+/14701713 Change-Id: I67c7e4e8a99f44ab2a8044d0fa1d3f8fd50d4e6c
2021-06-25Merge remote-tracking branch ↵Wilson Sung
'goog/qcom/release/LA.UM.9.1.C11.11.00.00.841.013' into sc-dev am: eb9f4d24af am: 471ae2ef73 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm8150/media/+/14701713 Change-Id: I644bfd6ac69fcb7f23ca79774034f37849a45539
2021-06-25Merge remote-tracking branch ↵Wilson Sung
'goog/qcom/release/LA.UM.9.1.C11.11.00.00.841.013' into sc-dev am: eb9f4d24af am: 4f33ec60e1 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm8150/media/+/14701713 Change-Id: If3a95d7341ce1297b318a7a50138750d61e8df62
2021-06-25Merge remote-tracking branch ↵android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r11android-12.1.0_r10android12L-devandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseWilson Sung
'goog/qcom/release/LA.UM.9.1.C11.11.00.00.841.013' into sc-dev am: eb9f4d24af Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm8150/media/+/14701713 Change-Id: I1973a18abec086d2080e2e375273fdd8f92e0d08
2021-06-25Merge remote-tracking branch ↵Wilson Sung
'goog/qcom/release/LA.UM.9.1.C11.11.00.00.841.013' into sc-dev am: eb9f4d24af Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm8150/media/+/14701713 Change-Id: Ia185480829c5cd4e06853082845c848e2fa931c9
2021-05-25Merge remote-tracking branch ↵android-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_r16android12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devWilson Sung
'goog/qcom/release/LA.UM.9.1.C11.11.00.00.841.013' into sc-dev Conflicts: conf_files/atoll/media_codecs.xml conf_files/atoll/media_codecs_performance.xml conf_files/atoll/media_codecs_vendor.xml conf_files/sm6150/media_codecs.xml conf_files/sm6150/media_codecs_sdmmagpie_v1.xml conf_files/sm6150/media_codecs_vendor_sdmmagpie_v1.xml mm-core/src/registry_table.c mm-core/src/registry_table_android.c mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp product.mk Bug: 188781413 Bug: 189096555 Change-Id: I3ff3c2d9f700e0e134fedc8e0012381cdd9442b3
2021-04-22Merge "sm6150: Limit the max performance load"qctecmdr
2021-03-09Merge "conf_files: trinket: Remove 2k and qhd profiles"qctecmdr
2021-03-09Merge "conf_files: msmnile: Remove 2k and qhd profiles"qctecmdr
2021-03-09Merge "conf_files: atoll: Remove 2k and qhd profiles"qctecmdr
2021-03-08conf_files: trinket: Remove 2k and qhd profilesShrikara B
Remove 2K and QHD profiles from media_profiles xml file. These resolutions are actually not supported by camera. Change-Id: Ib40939c2f4c1b2e274833c3cab42a603549ddd38
2021-03-05conf_files: sm6150: Remove 2k and qhd profilesShrikara B
Remove 2K and QHD profiles from media_profiles xml file. These resolutions are actually not supported by camera. Change-Id: I597e4ad8c6656e34be6bb3c85439fca2c38c5d77
2021-03-05conf_files: atoll: Remove 2k and qhd profilesShrikara B
Remove 2K and QHD profiles from media_profiles xml file. These resolutions are actually not supported by camera. Change-Id: I0c96636d3ae6de0e1fc69ce553e311c4a2fd21c0
2021-03-05conf_files: msmnile: Remove 2k and qhd profilesShrikara B
Remove 2K and QHD profiles from media_profiles xml file. These resolutions are actually not supported by camera. Change-Id: I9b0f7e625b0f290d2700d8d48bc4b48c586e602d
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 75c7f979e5 -s ↵Xin Li
ours am: 005fc0f2a9 -s ours am: 748f3f05bd -s ours am skip reason: Change-Id I9c2059f4238d06e0b6e0b0d9d74f8ba383a5beb8 with SHA-1 a7cf7d2235 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8112c80411d050b2a3ad0bbe4ec64cb748f70d10
2021-02-20[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/sm8150/media am: 53e1171c20 ↵Bob Badour
am: 2cd15a53b9 am: 3071d67c50 am: 59f342d58b Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sm8150/media/+/1588403 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8a072bc93f9665d14e83dc5b10ad7483a72f198b
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 75c7f979e5 -s ↵Xin Li
ours am: 005fc0f2a9 -s ours am skip reason: Change-Id I9c2059f4238d06e0b6e0b0d9d74f8ba383a5beb8 with SHA-1 a7cf7d2235 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If9c747d725b0d79abad17acd45df0e15f45a5520
2021-02-20[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/sm8150/media am: 53e1171c20 ↵Bob Badour
am: 2cd15a53b9 am: 3071d67c50 Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sm8150/media/+/1588403 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id88747a76552648ba134e7f758be58283fb524ab
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-19 17:34:23 +0000