Automerger Merge Worker
a2d4606864
Merge "Revert "gs101: move charger thermal HAL setup into common code" am: 38d2997f6a
am: c7d913dece
" into tm-d1-dev-plus-aosp
2022-05-26 17:39:52 +00:00
David Chao
8ba5b2e7af
Revert "gs101: move charger thermal HAL setup into common code" am: 38d2997f6a
am: c7d913dece
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18614370
Change-Id: Ifcdb98d61f6ae9814d4108cda745894b077b38b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26 17:39:47 +00:00
David Chao
8f2f26d1ff
Revert "gs101: move charger thermal HAL setup into common code" am: 38d2997f6a
am: 562af06a05
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18614370
Change-Id: I0dc2650c9a11757ca8b6e83febb12a1a76970cd3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26 17:39:43 +00:00
David Chao
b54f6428c4
Revert "gs101: move charger thermal HAL setup into common code" am: 38d2997f6a
am: c7d913dece
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18614370
Change-Id: I4bb09468643bfd0f6836c42e73edeaf328f51275
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26 17:39:22 +00:00
David Chao
c7d913dece
Revert "gs101: move charger thermal HAL setup into common code" am: 38d2997f6a
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18614370
Change-Id: Ifd967cdf8edf8c6ef8ae851b8132585758b93a0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26 17:12:58 +00:00
David Chao
562af06a05
Revert "gs101: move charger thermal HAL setup into common code" am: 38d2997f6a
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18614370
Change-Id: Ic2fe84de26917bd8d81b16d6a0d819b7c068ae36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26 17:11:29 +00:00
David Chao
38d2997f6a
Revert "gs101: move charger thermal HAL setup into common code"
...
This reverts commit 980650080a
.
Reason for revert: Since the vendor.thermal.symlinks is init early than google-module init
such as gpu cooling, the gpu cooling is not ready while creating thermal.symlinks.
Thermal-hal GPU thermal throttling will fail because there is no thermal-gpufreq-0 in thermal.symlinks.
Bug: 200615564
Test: thermal symlinks can be created in dev folder
Change-Id: Ia3b0999c7a8038f7be5e2390926ff74473c0c339
2022-05-26 17:53:01 +08:00
Automerger Merge Worker
438bac5471
Merge "Write the pullup value only if new value applied am: 11f2c88795
am: 1f412cfbd9
" into tm-d1-dev-plus-aosp am: 19774e548e
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18555372
Change-Id: Ifb731bbea3fb12f86059ed172d2ca5631df44d04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26 04:00:27 +00:00
Jimmy Hu
fa5c9ea710
Write the pullup value only if new value applied am: 11f2c88795
am: 0c364d873c
am: ed4e50425e
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18555372
Change-Id: Ibacf51288f1edb8244f6fec6294c6e7d59d96e08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26 04:00:07 +00:00
Jimmy Hu
0ca4caeeed
Write the pullup value only if new value applied am: 11f2c88795
am: 1f412cfbd9
am: 9244f004d4
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18555372
Change-Id: I35fc1ae982e4efac430a284a42864b72b83d7388
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26 03:58:32 +00:00
Automerger Merge Worker
19774e548e
Merge "Write the pullup value only if new value applied am: 11f2c88795
am: 1f412cfbd9
" into tm-d1-dev-plus-aosp
2022-05-26 03:33:59 +00:00
Jimmy Hu
cf7dc14517
Write the pullup value only if new value applied am: 11f2c88795
am: 1f412cfbd9
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18555372
Change-Id: I12ab8f44b33aa6c236a67e867781129cf8e3253b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26 03:33:47 +00:00
Jimmy Hu
9244f004d4
Write the pullup value only if new value applied am: 11f2c88795
am: 1f412cfbd9
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18555372
Change-Id: Ic554e1cd839c5eb1ca95c18b49f46cf3cdd6f353
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26 03:33:42 +00:00
Jimmy Hu
ed4e50425e
Write the pullup value only if new value applied am: 11f2c88795
am: 0c364d873c
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18555372
Change-Id: I766da748a786504f74c3a107022e45f833123e76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26 03:33:42 +00:00
Jimmy Hu
1f412cfbd9
Write the pullup value only if new value applied am: 11f2c88795
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18555372
Change-Id: I1ce2c2085f37f67e0ef8b31adca33cdca37c4dcf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26 02:57:21 +00:00
Jimmy Hu
0c364d873c
Write the pullup value only if new value applied am: 11f2c88795
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18555372
Change-Id: Ide4fb5595688e0cb76522fe45256e51fb55f0878
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26 02:56:13 +00:00
Jimmy Hu
11f2c88795
Write the pullup value only if new value applied
...
Bug: 226018845
Test: build, boot
Signed-off-by: Jimmy Hu <hhhuuu@google.com>
Change-Id: I64a964753fc89a29d278f1c426b2746abc2a2b12
2022-05-26 02:42:33 +00:00
Android Build Coastguard Worker
c382e4ee97
Snap for 8642511 from 980650080a
to tm-release
...
Change-Id: I4fe8ccd9371aac066c46f52620995b0aa641f4a3
2022-05-25 23:02:17 +00:00
Automerger Merge Worker
1b6f84e492
Merge "gs101: move charger thermal HAL setup into common code am: 980650080a
am: 10655880ef
" into tm-d1-dev-plus-aosp am: 0fb7e1fb6c
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17346883
Change-Id: I8e45c0dc3dc3f31f164ccc19d8028f2bffd66aa9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 08:46:45 +00:00
David Chao
4b1477db55
gs101: move charger thermal HAL setup into common code am: 980650080a
am: 0d8627b8eb
am: 89b416707a
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17346883
Change-Id: Ie328bd386a71fab285f801fc02b0a3b99ca48c87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 08:46:04 +00:00
David Chao
bd68080722
gs101: move charger thermal HAL setup into common code am: 980650080a
am: 0d8627b8eb
am: fb574fe307
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17346883
Change-Id: I963961a318bf559d608132bcb66646f6c5886b3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 08:45:46 +00:00
Automerger Merge Worker
0fb7e1fb6c
Merge "gs101: move charger thermal HAL setup into common code am: 980650080a
am: 10655880ef
" into tm-d1-dev-plus-aosp
2022-05-25 08:30:16 +00:00
David Chao
89b416707a
gs101: move charger thermal HAL setup into common code am: 980650080a
am: 0d8627b8eb
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17346883
Change-Id: I140e2f4266102040c336b821357849174c300e9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 08:30:10 +00:00
David Chao
0de4be2910
gs101: move charger thermal HAL setup into common code am: 980650080a
am: 10655880ef
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17346883
Change-Id: Iaf025b693039c4d30a9cd33e440bc480292c2621
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 08:30:10 +00:00
David Chao
fb574fe307
gs101: move charger thermal HAL setup into common code am: 980650080a
am: 0d8627b8eb
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17346883
Change-Id: I161ed3eeb5eee8fe9785fd25d05e4d3fa4b4177c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 08:30:03 +00:00
David Chao
0d8627b8eb
gs101: move charger thermal HAL setup into common code am: 980650080a
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17346883
Change-Id: Ib523f7c3c9c56de655fec1cc964bc218c495145e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 08:11:29 +00:00
David Chao
10655880ef
gs101: move charger thermal HAL setup into common code am: 980650080a
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17346883
Change-Id: Ib7040ab1ba045b0f677e39f44d5ca2f49a57bf22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 08:10:09 +00:00
David Chao
980650080a
gs101: move charger thermal HAL setup into common code
...
Bug: 200615564
Test: build pass
Change-Id: I5a32c2b695dc9fd3e29e580c8a82e25f6c3a5f69
2022-05-25 07:46:52 +00:00
Jinting Lin
e61f5307c1
Update pixel stability logging mask am: b3786e5827
am: 50385396c9
am: 26e211111a
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18451306
Change-Id: Iea7b375f9ba95ecc27f0e4d2031af63b094d5e76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 03:54:47 +00:00
Automerger Merge Worker
ca58586a09
Merge "Update pixel stability logging mask am: b3786e5827
am: 50385396c9
am: 62bfe07793
" into tm-qpr-dev-plus-aosp
2022-05-25 03:53:47 +00:00
Jinting Lin
3655e41067
Update pixel stability logging mask am: b3786e5827
am: 50385396c9
am: 62bfe07793
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18451306
Change-Id: I678a893de4226e697cb77009a47757867d32b17c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 03:53:44 +00:00
Jinting Lin
41425f4d33
Update pixel stability logging mask am: b3786e5827
am: 408298fd21
am: 7d680d6a57
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18451306
Change-Id: Ibb5deef4ad3a67e9b71583a860b861b209d74378
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 03:53:43 +00:00
Jinting Lin
26e211111a
Update pixel stability logging mask am: b3786e5827
am: 50385396c9
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18451306
Change-Id: I213aa09468c3d477045fad28c229a84eea8d8ce9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 03:18:07 +00:00
Jinting Lin
62bfe07793
Update pixel stability logging mask am: b3786e5827
am: 50385396c9
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18451306
Change-Id: I442e6eb3e2ace66e90edcf5640112fe005523eaa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 03:17:44 +00:00
Jinting Lin
7d680d6a57
Update pixel stability logging mask am: b3786e5827
am: 408298fd21
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18451306
Change-Id: I3ee94319e0087b6d069d7cca983fc53560c638f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 03:17:35 +00:00
Jinting Lin
50385396c9
Update pixel stability logging mask am: b3786e5827
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18451306
Change-Id: I67735e49a5623357b9f02c43b4d2a42ec66670c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 02:51:24 +00:00
Jinting Lin
408298fd21
Update pixel stability logging mask am: b3786e5827
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18451306
Change-Id: Ia727bd4557e0ad0d53f82b42ac334dfa7e742b8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-25 02:50:17 +00:00
Jinting Lin
b3786e5827
Update pixel stability logging mask
...
- add COMMON_HAL and PAL_PWR group
Bug: 232898035
Change-Id: I79586d9bd2b6c12cbf331dd7fb4c4da8525beee2
2022-05-25 02:32:21 +00:00
Ankit Goyal
5354ad7190
Deprecate allocator 4.0 in favor of AIDL V1 am: 557e70add3
am: 65943d53bb
am: 5d549fe04f
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18565496
Change-Id: Ia9c73cf0ad87370ccae9dbd09937cd88bca38de6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 23:09:43 +00:00
Ankit Goyal
054384b6c5
Deprecate allocator 4.0 in favor of AIDL V1 am: 557e70add3
am: 65943d53bb
am: b50a6e117e
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18565496
Change-Id: I6d08a19fe7c4522bc96f3d48e93254982e3b50db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 23:02:55 +00:00
Ankit Goyal
5bcd548b7b
Deprecate allocator 4.0 in favor of AIDL V1 am: 557e70add3
am: 0a206733fb
am: 882758fd12
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18565496
Change-Id: I8a1c35e8e7e566f588c4709c8d0d5d643d37cd56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 23:02:39 +00:00
Android Build Coastguard Worker
dd63352314
Snap for 8637088 from 7bb4293087
to tm-release
...
Change-Id: I15964fb341e37c379b4aad9428c07d5919d59ae2
2022-05-24 23:02:26 +00:00
Ankit Goyal
b50a6e117e
Deprecate allocator 4.0 in favor of AIDL V1 am: 557e70add3
am: 65943d53bb
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18565496
Change-Id: I7010593c7cf03795766994e75fa0e556943e0de6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 22:44:55 +00:00
Ankit Goyal
5d549fe04f
Deprecate allocator 4.0 in favor of AIDL V1 am: 557e70add3
am: 65943d53bb
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18565496
Change-Id: Ib071791a62c96b757ee47c64e57bc384ce6425ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 22:44:52 +00:00
Ankit Goyal
882758fd12
Deprecate allocator 4.0 in favor of AIDL V1 am: 557e70add3
am: 0a206733fb
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18565496
Change-Id: I5eb0531afdf1e17d56b1c4b2f6a84c47add1e278
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 22:34:52 +00:00
Pierre-Clément Tosi
7b50f2d385
[automerger skipped] Revert "gs101: Add pvmfw to AB_OTA_PARTITIONS" am: 3ba1a0dd6b
am: 42cc5cd651
-s ours am: 2f4f4127ed
-s ours am: 7309b2e866
-s ours
...
am skip reason: Merged-In Ib0f0ce2a2733f878bb680d16fea15cfa794b7c1d with SHA-1 871071afbc
is already in history. Merged-In was found from reverted change.
Original change: https://android-review.googlesource.com/c/device/google/gs101/+/2105125
Change-Id: Iaa56cd50f713886d58e3a986144fe6c3404e81f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 22:23:43 +00:00
Ankit Goyal
65943d53bb
Deprecate allocator 4.0 in favor of AIDL V1 am: 557e70add3
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18565496
Change-Id: Ibbd9ea7916da71f4c7c5fabc9ba4b07008173350
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 22:15:14 +00:00
Ankit Goyal
0a206733fb
Deprecate allocator 4.0 in favor of AIDL V1 am: 557e70add3
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18565496
Change-Id: I515c675bcfa82b520d9c0588f0a264ba41b0d794
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 22:13:41 +00:00
Pierre-Clément Tosi
7309b2e866
[automerger skipped] Revert "gs101: Add pvmfw to AB_OTA_PARTITIONS" am: 3ba1a0dd6b
am: 42cc5cd651
-s ours am: 2f4f4127ed
-s ours
...
am skip reason: Merged-In Ib0f0ce2a2733f878bb680d16fea15cfa794b7c1d with SHA-1 871071afbc
is already in history. Merged-In was found from reverted change.
Original change: https://android-review.googlesource.com/c/device/google/gs101/+/2105125
Change-Id: I82f9ca1706fe21bc1d623d452a6d8d0696a83ef8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 21:47:54 +00:00
Ankit Goyal
557e70add3
Deprecate allocator 4.0 in favor of AIDL V1
...
Bug: 220910504
Bug: 228405226
Fix: 233412845
Test: go/allocator4-deprecate
Change-Id: Ie6826b539fb1c780f4860acce440765ee3f99517
2022-05-24 21:42:02 +00:00