summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 2d6294b647 -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: 26a6e6be8f -s ours am skip reason: Change-Id I6657e1cdcb836d87fc62f92d0f8705dad94fb510 with SHA-1 71aaa15262 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic89c76fb7b7b3b5f02cfac55c317de1a2135dcf6
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 2d6294b647 -s oursXin Li
am skip reason: Change-Id I6657e1cdcb836d87fc62f92d0f8705dad94fb510 with SHA-1 71aaa15262 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2c368f0980379c84bc4f0a4ee83106954e145618
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: I6657e1cdcb836d87fc62f92d0f8705dad94fb510 Change-Id: I1ca4dee70ec490a5eef0f048fcfd1aca2302b7f0
2021-02-05[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/sm8150/thermal am: 20de91d793 ↵Bob Badour
am: 96bfdc13ce am: ba08d7056b Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sm8150/thermal/+/1576132 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic66e20e549fec1a77583732fe6a1e8745ad5fad5
2021-02-05[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/sm8150/thermal am: 20de91d793 ↵Bob Badour
am: 96bfdc13ce Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sm8150/thermal/+/1576132 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I76a00bb5aca22310032dce00886bd4913c7fcd07
2021-02-05[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/sm8150/thermal am: 20de91d793Bob Badour
Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sm8150/thermal/+/1576132 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ibfc51ca6886dd874bbccaf7a1e73e33b4a23ba06
2021-02-05[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/sm8150/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: I1f09622f9f2679a698f53b032f86631421b6d9d7
2020-11-23Mark ab/6881855 as merged am: 76c88b45bd am: 71aaa15262Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm8150/thermal/+/13112953 Change-Id: Ib66bc0ab0f6f564362f41f48d271113b268954da
2020-11-23Mark ab/6881855 as merged am: 76c88b45bdXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm8150/thermal/+/13112953 Change-Id: I6657e1cdcb836d87fc62f92d0f8705dad94fb510
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: I0e94d83bd37401ac9262330fedfd3cdefd554b9a
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: a9df92faa4 -s ours am: ↵Xin Li
b6516784e1 -s ours am: 160d95c116 -s ours am skip reason: Change-Id Ia8f75a96ac6e368d2538977c67db4d5c190eca08 with SHA-1 8da2dea8ea is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm8150/thermal/+/12796880 Change-Id: Idad4d6aae24678eaf5ec287b6ed797c3bdad9251
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: a9df92faa4 -s ours am: ↵Xin Li
b6516784e1 -s ours am skip reason: Change-Id Ia8f75a96ac6e368d2538977c67db4d5c190eca08 with SHA-1 8da2dea8ea is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm8150/thermal/+/12796880 Change-Id: I6b187cd9943e8ac9fbe48d71b7ecaa865ecbc404
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: a9df92faa4 -s oursXin Li
am skip reason: Change-Id Ia8f75a96ac6e368d2538977c67db4d5c190eca08 with SHA-1 8da2dea8ea is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm8150/thermal/+/12796880 Change-Id: Iec32190aa1237186511f0ef7a472d67a3d3af6bd
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: Ia8f75a96ac6e368d2538977c67db4d5c190eca08 Change-Id: I4a9347667bb23ce8d971cbed6a297c4954448756
2020-09-11[automerger skipped] Merge Android R am: ff9d761111 -s ours am: 2c4d408942 ↵Xin Li
-s ours am: 047e8b06ed -s ours am: f2b69134dc -s ours am: f029ad0286 -s ours am skip reason: Change-Id I76c7b62b7500c6af1fcfca614958c0993d921528 with SHA-1 d59a6f53d3 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sm8150/thermal/+/1422402 Change-Id: Ifb5fd0de9b590ad60554630b7318548d1fded7b5
2020-09-11[automerger skipped] Merge Android R am: ff9d761111 -s ours am: 2c4d408942 ↵Xin Li
-s ours am: 047e8b06ed -s ours am: f2b69134dc -s ours am skip reason: Change-Id I76c7b62b7500c6af1fcfca614958c0993d921528 with SHA-1 d59a6f53d3 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sm8150/thermal/+/1422402 Change-Id: Ie47388312868f4dd8a53d0deebb1036bd6374bbd
2020-09-11[automerger skipped] Merge Android R am: ff9d761111 -s ours am: 2c4d408942 ↵Xin Li
-s ours am: 047e8b06ed -s ours am skip reason: Change-Id I76c7b62b7500c6af1fcfca614958c0993d921528 with SHA-1 d59a6f53d3 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sm8150/thermal/+/1422402 Change-Id: I248956bb396480a5ffca5490090d7cd9715f9749
2020-09-11[automerger skipped] Merge Android R am: ff9d761111 -s ours am: 2c4d408942 ↵Xin Li
-s ours am skip reason: Change-Id I76c7b62b7500c6af1fcfca614958c0993d921528 with SHA-1 d59a6f53d3 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sm8150/thermal/+/1422402 Change-Id: I81ce58c80e8e7f9d9fbb49a6960403c43dca4fcd
2020-09-11[automerger skipped] Merge Android R am: ff9d761111 -s oursXin Li
am skip reason: Change-Id I76c7b62b7500c6af1fcfca614958c0993d921528 with SHA-1 d59a6f53d3 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sm8150/thermal/+/1422402 Change-Id: I7ec7a7aac11a4bc19fbf362c7b501cb32064647b
2020-09-08Merge Android RXin Li
Bug: 168057903 Merged-In: I76c7b62b7500c6af1fcfca614958c0993d921528 Change-Id: Ia5292c9546da8e4586b813ffa2a69edb6e35bd8f
2020-09-02[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: d59a6f53d3 -s ours am: 97239e5f07 -s ours am: 7d057913a0 -s ours am: 8781227663 -s ours am skip reason: Change-Id I84ebef54432ccd94172f01d5c20984fec0e6a480 with SHA-1 4c81a5e777 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm8150/thermal/+/12469638 Change-Id: I7bffb19ff326800f526e0d1e0e81cda5db209204
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: d59a6f53d3 -s ours am: 97239e5f07 -s ours am: 7d057913a0 -s ours am skip reason: Change-Id I84ebef54432ccd94172f01d5c20984fec0e6a480 with SHA-1 4c81a5e777 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm8150/thermal/+/12469638 Change-Id: I7f7c03c4cf5fc75273233d2bf4066c24e1f5f2bc
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: d59a6f53d3 -s ours am: 97239e5f07 -s ours am skip reason: Change-Id I84ebef54432ccd94172f01d5c20984fec0e6a480 with SHA-1 4c81a5e777 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm8150/thermal/+/12469638 Change-Id: Ia430565d45daaeef767104772ce057c2483b2843
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: d59a6f53d3 -s ours am skip reason: Change-Id I84ebef54432ccd94172f01d5c20984fec0e6a480 with SHA-1 4c81a5e777 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm8150/thermal/+/12469638 Change-Id: Ibe6f063193b69fd951a59e6b8c8d7677a4cbacc2
2020-08-27Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)temp_sam_168057903Xin Li
Bug: 166295507 Merged-In: I84ebef54432ccd94172f01d5c20984fec0e6a480 Change-Id: I76c7b62b7500c6af1fcfca614958c0993d921528
2020-05-05Add METADATA to sm8150/thermal: Apache2+BSD=NOTICE am: c6b8856c4a am: ↵Bob Badour
2f27907a27 am: 4c81a5e777 am: 8da2dea8ea am: a98b688882 Change-Id: I3d435c380889aa8358fe5892f1c5cfd5c81ed0c0
2020-05-05Add METADATA to sm8150/thermal: Apache2+BSD=NOTICE am: c6b8856c4a am: ↵Bob Badour
2f27907a27 am: 4c81a5e777 am: 8da2dea8ea Change-Id: I6157f7975ca2d777363bd641f4ff1f891f2c9126
2020-05-05Add METADATA to sm8150/thermal: Apache2+BSD=NOTICE am: c6b8856c4a am: ↵Bob Badour
2f27907a27 am: 4c81a5e777 Change-Id: Ia8f75a96ac6e368d2538977c67db4d5c190eca08
2020-05-05Add METADATA to sm8150/thermal: Apache2+BSD=NOTICE am: c6b8856c4a am: 2f27907a27Bob Badour
Change-Id: I84ebef54432ccd94172f01d5c20984fec0e6a480
2020-05-05Add METADATA to sm8150/thermal: Apache2+BSD=NOTICE am: c6b8856c4aandroid-r-beta-3android-r-beta-2Bob Badour
Change-Id: If3376bd98e60e15dec3d2474584146bbddc5bf96
2020-04-27Add METADATA to sm8150/thermal: Apache2+BSD=NOTICEBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: I0aac88c2f40a8ea351596d63c9fc668d8b5cf3d7
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 3a2c4cfa8b -s ours am: 00bdb4cbbb am: d7f3df2fe8 am: 2861df7cb7 -s ours am skip reason: subject contains skip directive Change-Id: I627eb403a51a6d2b5ba14cb709cf6f26f7ef7a23
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 3a2c4cfa8b -s ours am: 00bdb4cbbb am: d7f3df2fe8 Change-Id: I0a2ac9b84ce926afbc6762328793e9efa4eb5b1c
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 3a2c4cfa8b -s ours am: 00bdb4cbbb Change-Id: I3282d595e6a9ed73a8637babfb0c3fe16f239a8c
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 3a2c4cfa8b -s ours am skip reason: subject contains skip directive Change-Id: I261438e817216b28a059f297ce612dfc60dbf82b
2020-04-09DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li
Bug: 151763422 Change-Id: I677799210cc188075e0cf9ae0389cb922e82327a
2020-03-26Remove redundant NOTICE copied from LICENSE. am: 0fd4cde09a am: 9244866391 ↵Bob Badour
am: 363ff15332 am: 2fb4c3ee3e am: a92237a038 Change-Id: Ie202c6493fa277dd158144e285fec1ec2d8a4196
2020-03-26Remove redundant NOTICE copied from LICENSE. am: 0fd4cde09a am: 9244866391 ↵Bob Badour
am: 363ff15332 am: 2fb4c3ee3e Change-Id: Ic05b5f1e68af8cfccae326f52f5053d89a9ccd3d
2020-03-26Remove redundant NOTICE copied from LICENSE. am: 0fd4cde09a am: 9244866391 ↵Bob Badour
am: 363ff15332 Change-Id: I203662895e665617fa136a8490ea5c8c70272548
2020-03-26Remove redundant NOTICE copied from LICENSE. am: 0fd4cde09a am: 9244866391Bob Badour
Change-Id: I08dc34b26e01796534eec1f1b19ab1ee861e71ca
2020-03-26Remove redundant NOTICE copied from LICENSE. am: 0fd4cde09a am: 9244866391Bob Badour
Change-Id: Ife48f504ad48394665e3c303087993fef852bf6b
2020-03-26Remove redundant NOTICE copied from LICENSE. am: 0fd4cde09aBob Badour
Change-Id: Ic55e7c984ab25af0ef0b88a6c53c567f779c3c92
2020-03-25Remove redundant NOTICE copied from LICENSE.Bob Badour
Identified using the below shell script: $ find -H . -name LICENSE -type f -print0 | xargs -0 dirname \ | while read dir; do \ if [ -f "${dir}/NOTICE" ] \ && diff "${dir}/LICENSE" "${dir}/NOTICE" >/dev/null; then \ echo "${dir}/NOTICE"; \ fi; \ done Now that http://r.android.com/r/1235427 and http://r.android.com/r/1238719 are merged, LICENSE files copied into NOTICE files are no longer needed. Bug: 67772237 Bug: 68860345 Test: manually built and diffed before and after system image notices Change-Id: Ib08ed90f821151dbad74f2c703d15acc18a67c39
2019-12-23Merge remote-tracking branch 'goog/qcom/release/LA.UM.8.1.C9.09.00.00.518.343'r_aml_301500702android-mainline-12.0.0_r55android-mainline-12.0.0_r112android-mainline-11.0.0_r9android-mainline-11.0.0_r8android-mainline-11.0.0_r7android-mainline-11.0.0_r6android-mainline-11.0.0_r5android-mainline-11.0.0_r45android-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_r4android-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_r33android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r3android-mainline-11.0.0_r29android-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_r2android-mainline-11.0.0_r19android-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_r12android-mainline-11.0.0_r10android-mainline-11.0.0_r1android-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_r18android-11.0.0_r16aml_tz2_305400500aml_tz2_305400300aml_tz2_305400100aml_tz2_304500300aml_tz2_303900110aml_tz2_303900102aml_tz2_303800002aml_tz2_303800001aml_tz2_303200001android12-mainline-tzdata2-releaseandroid11-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-mainline-tethering-releaseandroid11-mainline-sparse-2021-jan-releaseandroid11-mainline-sparse-2020-dec-releaseandroid11-mainline-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-releaseandroid11-devandroid11-d2-releaseandroid11-d1-b-releaseaml_tz2_305400100ChengYou Ho
Bug: 146759211 Change-Id: I67261a1a8c64e0c85a4afb83618354f438db943e
2019-10-22thermal-hal: Add sensor config for bengalManaf Meethalavalappu Pallikunhi
Add temperature sensor config for CPU, GPU, battery and skin for bengal. These sensors will be used by thermal HAL. Change-Id: I0dbd39592312f853b07ba8f05e75c010a397e8e7
2019-10-18Skip QD1A.190821.011 in stage-aosp-master am: ae363bd3d3 am: b2355a3748Xin Li
am: 015a5444da Change-Id: Iafd1547dbfa64a38ddee93ea9427720f7961c92c
2019-10-18Skip QD1A.190821.011 in stage-aosp-master am: ae363bd3d3android-r-preview-4android-r-preview-3android-r-preview-2android-mainline-10.0.0_r8android-mainline-10.0.0_r6android10-mainline-resolv-releaseandroid10-mainline-networking-releaseXin Li
am: b2355a3748 Change-Id: I5aa3f558488e9dffe7504f0fe335e3d39d2aac51
2019-10-18Skip QD1A.190821.011 in stage-aosp-masterXin Li
am: ae363bd3d3 Change-Id: Ic384fe871952f9bf41f49a9a4a3a0aa7dee75987
2019-10-16Skip QD1A.190821.011 in stage-aosp-masterplatform-tools-29.0.6android-r-preview-1Xin Li
Bug: 141248619 Change-Id: I50f5a0fbdb26bf054d6cb57348458e7c8e2aa18d
2019-09-22Merge "thermal-hal: Update the sensor list for kona"qctecmdr
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 20:22:07 +0000