summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-11-05Replace is-board-platform[-in-list] with is-board-platform[-in-list]2 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_330444000android-u-beta-1-gplandroid-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_331910010aml_uwb_331820070aml_uwb_331613010aml_uwb_331611010aml_uwb_331410010aml_uwb_331310030aml_uwb_331115000aml_uwb_331015040aml_uwb_330810010aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000aml_sch_331113000aml_sch_331111000aml_net_331910030aml_net_331812010aml_net_331710000aml_net_331610000aml_net_331412000aml_net_331313030aml_net_331313010aml_net_331110020aml_net_331011030aml_net_330910010aml_net_330811010aml_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_ase_331311020aml_ase_331112000aml_ase_331011020aml_art_331813100aml_art_331813010aml_art_331711080aml_art_331612010aml_art_331413030aml_art_331314010aml_art_331113000aml_art_331012050aml_ads_331920180aml_ads_331814200aml_ads_331710270aml_ads_331611190aml_ads_331511020aml_ads_331418080aml_ads_331131000mastermain-16k-with-phonesmain-16kmainandroid13-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_tz4_332714010Sasha Smundak
38a0e2bf84 am: 751df30b68 am: f4b41e82fb am: 3d245f94db am: 2709d46bd2 Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sdm845/thermal/+/1871697 Change-Id: Ib343cf24e071ae2fed15c4a13ee22a0888513854
2021-11-05Replace is-board-platform[-in-list] with is-board-platform[-in-list]2 am: ↵Sasha Smundak
38a0e2bf84 am: 751df30b68 am: f4b41e82fb am: 3d245f94db Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sdm845/thermal/+/1871697 Change-Id: I4a4be29ec474349ee74757b948a6f6e0b0706d3b
2021-11-05Replace is-board-platform[-in-list] with is-board-platform[-in-list]2 am: ↵Sasha Smundak
38a0e2bf84 am: 751df30b68 am: f4b41e82fb Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sdm845/thermal/+/1871697 Change-Id: Ifac261ff0acc98d80de1053b0ffe36b59727aa18
2021-11-05Replace is-board-platform[-in-list] with is-board-platform[-in-list]2 am: ↵Sasha Smundak
38a0e2bf84 am: 751df30b68 Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sdm845/thermal/+/1871697 Change-Id: Id137637c6b75d28befa82fae3a173a2419f84d2e
2021-11-05Replace is-board-platform[-in-list] with is-board-platform[-in-list]2 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-1Sasha Smundak
38a0e2bf84 Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sdm845/thermal/+/1871697 Change-Id: I1f05138280426c9b21c97e9e9fe8470e792aed57
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: Ie1d5b7aa396fcb3fe151e0e1329fbbcb4dd30333
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 6bcf1160d3 -s ↵Xin Li
ours am: c69d5fdf1f -s ours am: 65b1346b5f -s ours am skip reason: Change-Id I33b37419913bbd397207fb53212488ea3885aedd with SHA-1 8ba2a45e2b is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8b930445822d3931782697f105d9c595fe8f0854
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 6bcf1160d3 -s ↵android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-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-devandroid-s-v2-preview-1Xin Li
ours am: c69d5fdf1f -s ours am skip reason: Change-Id I33b37419913bbd397207fb53212488ea3885aedd with SHA-1 8ba2a45e2b is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iba75ede331938dfbcead97fa34f003658f5cb3e2
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 6bcf1160d3 -s oursXin Li
am skip reason: Change-Id I33b37419913bbd397207fb53212488ea3885aedd with SHA-1 8ba2a45e2b is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ifeb855e2c344ae7d137dab2d0382e1c9fa8fcfef
2021-02-20Mark ab/7061308 as merged in stage.android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-5android-s-beta-4Xin Li
Bug: 180401296 Merged-In: I33b37419913bbd397207fb53212488ea3885aedd Change-Id: I1c0b8db09fc7ab72285992daa29e49e7cee655c5
2021-02-05[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/sdm845/thermal am: ab56da73c4 ↵Bob Badour
am: 3727fc84a8 am: c7e2b409c9 am: 5513a2bbac Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sdm845/thermal/+/1576086 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7c6155928e06bc00d6f3b84f7fc1ff80e7fcc05b
2021-02-05[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/sdm845/thermal am: ab56da73c4 ↵Bob Badour
am: 3727fc84a8 am: c7e2b409c9 Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sdm845/thermal/+/1576086 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id5646cad6ba00759c5aac0c72262132d9a897c33
2021-02-05[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/sdm845/thermal am: ab56da73c4 ↵Bob Badour
am: 3727fc84a8 Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sdm845/thermal/+/1576086 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I20654d88ea29d53c03de0223ce58177cf9a2db16
2021-02-05[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/sdm845/thermal am: ab56da73c4Bob Badour
Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sdm845/thermal/+/1576086 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If13a6afe252bd2285e2d6a5984400aea8dd06105
2021-02-05[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/sdm845/thermalandroid-s-preview-1Bob Badour
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD legacy_not_a_contribution to: Android.mk Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I0e2076a20c8240f074f05e03dd06386faef14714
2020-11-25Mark ab/6881855 as merged am: e181b6d041 am: 8ba2a45e2bXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sdm845/thermal/+/13109975 Change-Id: Ie1c07209bdfd1404a968c8bae1a0d0a652ae0a89
2020-11-25Mark ab/6881855 as merged am: e181b6d041Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sdm845/thermal/+/13109975 Change-Id: I33b37419913bbd397207fb53212488ea3885aedd
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: I8cbd032e93be1804959a1fc714a230ea7a556337
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: b593891704 -s ours am: ↵Xin Li
3847b07ecc -s ours am: a549739c13 -s ours am skip reason: Change-Id I2480c4732265e303cf1a727ee376e367c970e929 with SHA-1 6d3b611b16 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sdm845/thermal/+/12796897 Change-Id: I0465798137437e874db3ba8e7c9d7ecfcee9eaa1
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: b593891704 -s ours am: ↵Xin Li
3847b07ecc -s ours am skip reason: Change-Id I2480c4732265e303cf1a727ee376e367c970e929 with SHA-1 6d3b611b16 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sdm845/thermal/+/12796897 Change-Id: I64e6b9906de8730be7a2d5ea46f16f68e61d7d35
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: b593891704 -s oursXin Li
am skip reason: Change-Id I2480c4732265e303cf1a727ee376e367c970e929 with SHA-1 6d3b611b16 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sdm845/thermal/+/12796897 Change-Id: Ibf9b03d3699d1082b6484d484ba34fa2208d03c8
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: I2480c4732265e303cf1a727ee376e367c970e929 Change-Id: I11c80c3b8d6af17b41172eccd4090aac75e87424
2020-09-11[automerger skipped] Merge Android R am: 8a482bd1c4 -s ours am: 5ca81cbbd0 ↵Xin Li
-s ours am: 1647e7fada -s ours am: a0c8bcfa84 -s ours am: 1928a65210 -s ours am skip reason: Change-Id Id718c5b4b6d4be4b00d7774f5e6a86c74c05b684 with SHA-1 c989a84ff6 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sdm845/thermal/+/1422439 Change-Id: If71dd14a923b6f9e4a292044f1b7cc5ce01ce932
2020-09-11[automerger skipped] Merge Android R am: 8a482bd1c4 -s ours am: 5ca81cbbd0 ↵Xin Li
-s ours am: 1647e7fada -s ours am: a0c8bcfa84 -s ours am skip reason: Change-Id Id718c5b4b6d4be4b00d7774f5e6a86c74c05b684 with SHA-1 c989a84ff6 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sdm845/thermal/+/1422439 Change-Id: I00486012bcf38204cca0c17623de0127229f2f9a
2020-09-11[automerger skipped] Merge Android R am: 8a482bd1c4 -s ours am: 5ca81cbbd0 ↵Xin Li
-s ours am: 1647e7fada -s ours am skip reason: Change-Id Id718c5b4b6d4be4b00d7774f5e6a86c74c05b684 with SHA-1 c989a84ff6 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sdm845/thermal/+/1422439 Change-Id: Ieffaedf0638185218386ff09e2f18451275c2d06
2020-09-11[automerger skipped] Merge Android R am: 8a482bd1c4 -s ours am: 5ca81cbbd0 ↵Xin Li
-s ours am skip reason: Change-Id Id718c5b4b6d4be4b00d7774f5e6a86c74c05b684 with SHA-1 c989a84ff6 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sdm845/thermal/+/1422439 Change-Id: Ie7cf348090b9b160c6a86807885448256aa9435e
2020-09-11[automerger skipped] Merge Android R am: 8a482bd1c4 -s oursXin Li
am skip reason: Change-Id Id718c5b4b6d4be4b00d7774f5e6a86c74c05b684 with SHA-1 c989a84ff6 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sdm845/thermal/+/1422439 Change-Id: I393b90c061f798deb788a4ec1b687a0c16a9cb13
2020-09-08Merge Android RXin Li
Bug: 168057903 Merged-In: Id718c5b4b6d4be4b00d7774f5e6a86c74c05b684 Change-Id: Icfaa3f24a7210e1fb1e8305bbbdbb1dd0064bb9d
2020-09-02[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: c989a84ff6 -s ours am: b99d349feb -s ours am: fce6b1f4d2 -s ours am: a1618bd1d7 -s ours am skip reason: Change-Id Ice8deea93919c5c2b33395f82592e44c88989b28 with SHA-1 be6f16a531 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sdm845/thermal/+/12470189 Change-Id: I934b8a2244a89e93a4566a98f47c98b97081f908
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: c989a84ff6 -s ours am: b99d349feb -s ours am: fce6b1f4d2 -s ours am skip reason: Change-Id Ice8deea93919c5c2b33395f82592e44c88989b28 with SHA-1 be6f16a531 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sdm845/thermal/+/12470189 Change-Id: I146e4bebc0e8784dca3d5105e8b6b8993008b325
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: c989a84ff6 -s ours am: b99d349feb -s ours am skip reason: Change-Id Ice8deea93919c5c2b33395f82592e44c88989b28 with SHA-1 be6f16a531 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sdm845/thermal/+/12470189 Change-Id: I8bb23964cdfd5ad92b0865ab9e5a8696f1dc2367
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: c989a84ff6 -s ours am skip reason: Change-Id Ice8deea93919c5c2b33395f82592e44c88989b28 with SHA-1 be6f16a531 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sdm845/thermal/+/12470189 Change-Id: I17f9e1dcce9789852c556b1bcf313203be0d8007
2020-08-27Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)temp_sam_168057903Xin Li
Bug: 166295507 Merged-In: Ice8deea93919c5c2b33395f82592e44c88989b28 Change-Id: Id718c5b4b6d4be4b00d7774f5e6a86c74c05b684
2020-05-05Add METADATA to thermal: BSD+Apache2=NOTICE am: 3a68d502cb am: 069704a519 ↵Bob Badour
am: be6f16a531 am: 6d3b611b16 am: fdb6ef4521 Change-Id: If80a4b8809aa32e6839eb81bfbc5a8120eac88df
2020-05-05Add METADATA to thermal: BSD+Apache2=NOTICE am: 3a68d502cb am: 069704a519 ↵Bob Badour
am: be6f16a531 am: 6d3b611b16 Change-Id: I9b72c3fd1c9aa9bf02817a6fea419d45a5b9494a
2020-05-05Add METADATA to thermal: BSD+Apache2=NOTICE am: 3a68d502cb am: 069704a519 ↵Bob Badour
am: be6f16a531 Change-Id: I2480c4732265e303cf1a727ee376e367c970e929
2020-05-05Add METADATA to thermal: BSD+Apache2=NOTICE am: 3a68d502cb am: 069704a519Bob Badour
Change-Id: Ice8deea93919c5c2b33395f82592e44c88989b28
2020-05-05Add METADATA to thermal: BSD+Apache2=NOTICE am: 3a68d502cbandroid-r-beta-3android-r-beta-2Bob Badour
Change-Id: I89d091a6c5678235f944bd2b6ebe7796f2f4dc43
2020-05-01Add METADATA to thermal: BSD+Apache2=NOTICEBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: I76b79239196503727e3280697650c4835394aeda
2020-03-23Merge remote-tracking branch ↵Alex Hong
'goog/qcom/release/LA.UM.7.8.9.C2.08.00.00.618.012' into rvc-dev am: 30ce54b7b0 am: e473ba3d58 am: 08972b2fe3 am: f83181006d am: 2470f7a1c2 Change-Id: Ie340590df7e46476ca1c7adafca7f55d99f42d8b
2020-03-23Merge "Merge remote-tracking branch ↵Automerger Merge Worker
'goog/qcom/release/LA.UM.7.8.9.C2.08.00.00.618.012' into rvc-dev am: 30ce54b7b0 am: 2e421e7755" into rvc-d1-dev-plus-aosp am: 0ed39094ed am: 7a0b913aed Change-Id: I6e6eb499ad98844e649d98eed36fd05deefb41f5
2020-03-23Merge remote-tracking branch ↵Alex Hong
'goog/qcom/release/LA.UM.7.8.9.C2.08.00.00.618.012' into rvc-dev am: 30ce54b7b0 am: e473ba3d58 am: 0193f4aec3 am: 86ed4af0e9 Change-Id: I1c0aeaea5c2c8a5f8c0faa7a3372aad9304c3129
2020-03-23Merge remote-tracking branch ↵Alex Hong
'goog/qcom/release/LA.UM.7.8.9.C2.08.00.00.618.012' into rvc-dev am: 30ce54b7b0 am: e473ba3d58 am: 08972b2fe3 am: f83181006d Change-Id: I44742a4a44d933f7e6e47f1b8f327efdf21db221
2020-03-23Merge "Merge remote-tracking branch ↵Automerger Merge Worker
'goog/qcom/release/LA.UM.7.8.9.C2.08.00.00.618.012' into rvc-dev am: 30ce54b7b0 am: 2e421e7755" into rvc-d1-dev-plus-aosp am: 0ed39094ed Change-Id: I91abc608e36dde44961b1360a66621287f140ba3
2020-03-23Merge remote-tracking branch ↵Alex Hong
'goog/qcom/release/LA.UM.7.8.9.C2.08.00.00.618.012' into rvc-dev am: 30ce54b7b0 am: e473ba3d58 am: 08972b2fe3 Change-Id: I04c6f942ef4ba7610e03cb9d2c59e80b279a56d7
2020-03-23Merge remote-tracking branch ↵Alex Hong
'goog/qcom/release/LA.UM.7.8.9.C2.08.00.00.618.012' into rvc-dev am: 30ce54b7b0 am: e473ba3d58 am: 0193f4aec3 Change-Id: Iec2037ac7d1e78bc6ea2827d65c5d55be9a8fd88
2020-03-23Merge "Merge remote-tracking branch ↵Automerger Merge Worker
'goog/qcom/release/LA.UM.7.8.9.C2.08.00.00.618.012' into rvc-dev am: 30ce54b7b0 am: 2e421e7755" into rvc-d1-dev-plus-aosp
2020-03-23Merge remote-tracking branch ↵Alex Hong
'goog/qcom/release/LA.UM.7.8.9.C2.08.00.00.618.012' into rvc-dev am: 30ce54b7b0 am: 2e421e7755 Change-Id: I7dc50808af151ea23726f135ce6925d4a2958aa0
2020-03-23Merge remote-tracking branch ↵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-releaseAlex Hong
'goog/qcom/release/LA.UM.7.8.9.C2.08.00.00.618.012' into rvc-dev am: 30ce54b7b0 am: e473ba3d58 Change-Id: I1ed80fe1e4165962501e5bde5761510ee37bdef7
2020-03-23Merge remote-tracking branch ↵Alex Hong
'goog/qcom/release/LA.UM.7.8.9.C2.08.00.00.618.012' into rvc-dev am: 30ce54b7b0 am: e473ba3d58 Change-Id: I7a92b91e400b809c09de97188ea6fe1ba375f6c4