summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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 ↵android-11.0.0_r16android11-d1-b-releaseAlex Hong
'goog/qcom/release/LA.UM.7.8.9.C2.08.00.00.618.012' into rvc-dev am: 30ce54b7b0 Change-Id: I00930def061a4912dcb94cf1787b2f1f05758a86
2020-02-26Merge remote-tracking branch ↵android-mainline-12.0.0_r112android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12aml_tz2_305400500aml_tz2_305400300aml_tz2_305400100aml_tz2_304500300aml_tz2_303900110aml_tz2_303900102aml_tz2_303800002aml_tz2_303800001aml_tz2_303200001android12-mainline-tzdata2-releaseandroid11-mainline-tethering-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseandroid11-devaml_tz2_305400100Alex Hong
'goog/qcom/release/LA.UM.7.8.9.C2.08.00.00.618.012' into rvc-dev Bug: 149539244 Change-Id: Id7135efe7c3b91284056270f6c119747d2b3435b
2019-10-30[automerger skipped] DO NOT MERGE - ↵Xin Li
qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 6a8568c80a am: 5c1c45ebed -s ours am skip reason: subject contains skip directive Change-Id: Ic0dfa389aa76a53f94392f1c57921d0c55356b54
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵android-r-preview-4android-r-preview-3android-r-preview-2Xin Li
stage-aosp-master am: 6a8568c80a Change-Id: If500f4e30b62758d95b73dc851815a1cd5617b0a
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵android-r-preview-1Xin Li
stage-aosp-master Bug: 142003500 Change-Id: I847f55b1cac6e5036bd28604313d685145a6b3e9
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: aa3afd9fa8 -s ours am: 84312b6396 -s ours am: 97fa980e9d -s ours am skip reason: change_id I8c96c0c822f50b12b9f703bef0e64142e3b14bc8 with SHA1 a559c4d21a is in history Change-Id: I4140f8c28d2ee8787b9e8e87ba7b6903088711e9
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: aa3afd9fa8 -s ours am: 84312b6396 -s ours am skip reason: change_id I8c96c0c822f50b12b9f703bef0e64142e3b14bc8 with SHA1 a559c4d21a is in history Change-Id: I39b439b52e3dd1a7ebe7e2c5647b075cff868268
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: aa3afd9fa8 -s ours am skip reason: change_id I8c96c0c822f50b12b9f703bef0e64142e3b14bc8 with SHA1 a559c4d21a is in history Change-Id: Ieca59a0feefd93bb93543fa79cc26b215608d122
2019-09-08Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-masterXin Li
No content change. Bug: 135460123 Change-Id: Ie284801096463766b8af2e7623029236461b0fe9 Merged-In: I8c96c0c822f50b12b9f703bef0e64142e3b14bc8
2019-09-05[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: ↵Xin Li
a559c4d21a -s ours am: 07e8cd03d8 am: d2734bab1e am: 53b326f8c8 -s ours am skip reason: subject contains skip directive Change-Id: Ifc5baf02b0efa8c855d5e4962d8644b0f0313bd3
2019-09-05[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: ↵Xin Li
a559c4d21a -s ours am: 07e8cd03d8 am: d2734bab1e Change-Id: Ic461e96a476b98d084c2cba462ee72eb04b09306
2019-09-05[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: ↵Xin Li
a559c4d21a -s ours am: 07e8cd03d8 Change-Id: Id119e3e1551c1e7dcba6d0b8bd7e415c808705fc
2019-09-05[automerger skipped] DO NOT MERGE - Merge Android 10 into masterXin Li
am: a559c4d21a -s ours am skip reason: subject contains skip directive Change-Id: I7a16b133a809ad173e158d286719130f127e5854
2019-09-04DO NOT MERGE - Merge Android 10 into masterndk-sysroot-r21Xin Li
Bug: 139893257 Change-Id: I8c96c0c822f50b12b9f703bef0e64142e3b14bc8
2019-07-24thermal-hal: Add sensor config for ATOLLManaf Meethalavalappu Pallikunhi
Add temperature sensor config for CPU, GPU, battery and skin for ATOLL. These sensors will be used by thermal HAL. Use lito sensors for ATOLL. Change-Id: I7f68dcdd024fe8855c0d8f65a16c0baec204ddfd
2019-07-02[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor ↵Xin Li
(5699924) into stage-aosp-master am: 9d22a5e516 am: e6c6444a0a -s ours am skip reason: subject contains skip directive Change-Id: I0c4ae7db403560d0808bc828a3b6e7bb4be23a63
2019-07-02DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into ↵Xin Li
stage-aosp-master am: 9d22a5e516 Change-Id: I4662c0a28d6c6d5703dbcfe687a9ac990455d660
2019-07-01DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into ↵temp_140451723Xin Li
stage-aosp-master Bug: 134405016 Change-Id: I9c7604c2b2d489c4c59120fad9eb29b386187366
2019-06-26thermal-hal: Add soc ID for msmnileRam Chandrasekar
Add the new soc ID for msmnile. This will enable the thermal HAL to be available for all the msmnile variants. Change-Id: Ic1cb827e4e6ccbc85d5212d3c16fb89dec3c79fa
2019-04-30thermal-hal: Add sensor config for litoManaf Meethalavalappu Pallikunhi
Add temperature sensor config for CPU, GPU, battery and skin for lito. These sensors will be used by thermal HAL. Use sdmmagpie CPU sensors for lito. Change-Id: I064a2445a142a2182331bcbd05fc2e218fc46e3c
2019-04-03Merge master@5428150 into git_qt-dev. am: 104147829eBill Rassieur
am: ca780381ed Change-Id: I79f92a975220067a0d5329a4f568f80e9dde7007
2019-04-03Merge master@5428150 into git_qt-dev-plus-aosp.android-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-releaseandroid10-qpr1-mainline-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseBill Rassieur
am: 11348eabb7 Change-Id: I2b289b70146631c33796167f90f449ccc6c8b6d5
2019-04-03Merge master@5428150 into git_qt-dev.Bill Rassieur
am: 104147829e Change-Id: Icedfd8f51b3fe3a5a17a8ff07c926a47c0834c46
2019-04-02Merge master@5428150 into git_qt-dev-plus-aosp.Bill Rassieur
Change-Id: I977dcfa7877b7af0a2b961890914214b2b7f6395 BUG: 129345239
2019-04-02Merge master@5428150 into git_qt-dev.Bill Rassieur
Change-Id: Ie3321fc2ecdcb0bda23f5f3f2b65f273cab7ce9d BUG: 129345239
2019-03-14Merge remote-tracking branch 'goog/qcom/release/LA.UM.7.8.9.C1.08.00.00.516.101'Robin Peng
Bug: 128508596 Change-Id: I4bb96b67c3a720c8946caed0adb6a98c3eee449c
2019-02-24[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li
am: 6a84f98596 -s ours am skip reason: subject contains skip directive Change-Id: I250939101c066f55561ec48d948bb382d14b4492
2019-02-20DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li
Bug: 120848293 Change-Id: I3169526666d74b36b374462970c2b0dbb01f035e
2019-02-20thermal-hal: Update power cluster cpu sensor for TRINKETManaf Meethalavalappu Pallikunhi
Update power cluster cpu sensor for TRINKET based on latest TSENS floor plan recommendation. Change-Id: Idefa6ccf67d80a528f6c304563632d665580b89b
2019-02-14Merge remote-tracking branch 'goog/qcom/release/LA.UM.7.8.9.C1.08.00.00.516.083'Robin Peng
Bug: 124397977 Change-Id: I3fd8df8e2449c68cbb369400471287ad5db236a5
2019-02-11thermal-hal: Update cpu sensors list for TRINKETManaf Meethalavalappu Pallikunhi
Update cpu sensors list based on latest TSENS floor plan for TRINKET. Change-Id: I862d682bf441a3eeeaf8aa2190756d02d7775bc6
2019-01-18thermal-hal: Add support for KonaRam Chandrasekar
Add support for Kona. Kona will use the same sensors as msmnile. Change-Id: Ibd9590333ceac406409452a9756dff1d3346c021
2019-01-02Merge remote-tracking branch 'goog/qcom/release/LA.UM.7.8.9.C1.08.00.00.516.007'Robin Peng
Bug: 121228685 Change-Id: I9bbc678bae405b52b6eeeda8133574f9e9fe8b71
2018-12-19thermal-hal: Add sensor config for trinketManaf Meethalavalappu Pallikunhi
Add temperature sensor config for CPU, GPU, battery and skin for trinket. These sensors will be used by thermal HAL. Change-Id: Ie1d9d125cdee8dc77942aa360c6cf305b27e7bf5
2018-12-06thermal-hal: Add sensor config for MSM8917/QM215Manaf Meethalavalappu Pallikunhi
Add temperature sensor config for CPU, GPU, battery and skin for MSM8917/QM215. These sensors will be used by thermal HAL. Change-Id: I94453a845cd77ee99c0455327987ade6e889da29
2018-12-06thermal-hal: Add sensor config for sdmmagpieManaf Meethalavalappu Pallikunhi
Add temperature sensor config for CPU, GPU, battery and skin for sdmmagpie. These sensors will be used by thermal HAL. Change-Id: Iae52d547747c0dab87c62205b68882953bac1577
2018-12-05[automerger skipped] DO NOT MERGE am: ec43095960 -s ours am: ba907922fc -s ↵Xin Li
ours am: 8d93343bfc -s ours Change-Id: I623abf022b45a7edeb726fc33ed48fb28a8a8e32
2018-12-05[automerger skipped] DO NOT MERGE am: ec43095960 -s oursXin Li
am: ba907922fc -s ours Change-Id: I035a364542547a7f339979cb77ddaff4df57db37
2018-12-05[automerger skipped] DO NOT MERGEXin Li
am: ec43095960 -s ours Change-Id: I0edb87d61bd179b63d98267cfd59d90f4c103f02
2018-12-05DO NOT MERGEandroid-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1Xin Li
Merge pie-platform-release (PPRL.181105.017, history only) into master Bug: 118454372 Change-Id: I1b41564e48e28feffe1af89afc0a671d6ac966ce
2018-10-10thermal-hal: Add sensor config for talosManaf Meethalavalappu Pallikunhi
Add temperature sensor config for CPU, GPU, battery and skin for talos. These sensors will be used by thermal HAL. Change-Id: Ib781b266eafd8506b54a068c16ebd4043dc99966
2018-10-10thermal-hal: Add thermal HAL support for SDM712Manaf Meethalavalappu Pallikunhi
Add get temperature API support for SDM712 target. It shares sensor configuration with SDM710. Change-Id: I5b0de79d8fc284e1d628a8c0ae8a8a300a8e82ed
2018-09-19thermal-hal: Add sensor config for msmnileRam Chandrasekar
Add temperature sensor config for CPU, GPU, battery and skin for msmnile. These sensors will be used to fetch the temperature using thermal HAL. Change-Id: Ic8bf4f205e7366ba4fccbdad39ed7ce769f64704 Signed-off-by: Ram Chandrasekar <rkumbako@codeaurora.org>
2018-09-07thermal-hal: Update get temperature API support for legacy targetsManaf Meethalavalappu Pallikunhi
Add support for get temperature API support for legcay targets including SDM710, QCS605, SDM660, SDM630, MSM8953, SDM632, SDM439 etc. There are targets which are binary compatible, but uses different sensor configuration. Enable soc id based platform detection and use different sensor configuration. Change-Id: I2537476c07887f9131c33b352f5ffd3a4bc0dd31
2018-09-07thermal-hal: Re-arch thermal HAL implementationManaf Meethalavalappu Pallikunhi
Re-design thermal HAL server side implementation to accomodate below features. -Use sensor names and get thermal zone ids on the fly using sensor names. -Generalize APIs implementation and remove repeated code implementation in target specific files. -Minimize target specific configuration and avoid target specific file going forward. Change-Id: Ib61c591d60d17aaeac0eb84ec9b3a4775173a416
2018-06-03Snap for 4818534 from b9d9e99703d662976078887d105644ccd7d03759 to pi-releasepie-platform-releaseandroid-build-team Robot
Change-Id: Iadf379459c70607d02647f3287cba1e074c29d11
2018-06-01Merge branch 'qcom/release/LA.UM.7.3.9.08.00.00.385.328' into pi-dev am: ↵aaronding
b9d9e99703 am: c513a9f94c Change-Id: I5d0db4840300e90bf23b9b77950234f319780c8a
2018-06-01Merge branch 'qcom/release/LA.UM.7.3.9.08.00.00.385.328' into pi-devandroid-wear-8.0.0_r2aaronding
am: b9d9e99703 Change-Id: I4bd65236813aa8b91138784a117896eab22717fd
2018-05-25Merge branch 'qcom/release/LA.UM.7.3.9.08.00.00.385.328' into pi-devandroid-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-b4s4-releasepie-b4s4-devaaronding
Bug: 80274434 Change-Id: Iefdbda80a48cdeb660eb6ba739b86912b41e8e2c
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-01 06:02:44 +0000