| Age | Commit message (Collapse) | Author |
|---|
|
Linux version 5.10.177-android13-4-00003-ga7208022a7ea-ab10815828
(build-user@build-host) (Android (8508608, based on r450784e)
clang version 14.0.7
(https://android.googlesource.com/toolchain/llvm-project
4c603efb0cca074e9238af8b4106c30add4418f6), LLD 14.0.7) #1 SMP
PREEMPT Fri Sep 15 16:40:54 UTC 2023
prebuilts/misc: (2 changes)
0b679bfd Merge "Update prebuilt platform protos for recent statsd changes." into main
9a005473 Update prebuilt platform protos for recent statsd changes.
private/google-modules/gpu: (1 change)
8d366ed4 GPUCORE-39469 Error handling for invalid slot when parsing trace data
Bug: 304341806
Pick-Prebuilt: 573785512
Build-Id: 10955799
Processing-Config: kernel_headers
Merged-In: Ic0c01f05bb67b9a4ac34ed15683ad746616ec590
Change-Id: I6127dc005db6cbdc02715d7ee726714fcc86efe3
Signed-off-by: Jörg Wagner <jorwag@google.com>
|
|
Change-Id: I5567f75e1e27ca7da669eea94dd198d4adcf9722
|
|
udc-qpr1-release
Change-Id: I3a6b0e511cce34c080c7c32f322d0e6de959db0c
|
|
MERGE ] am: 2dea24c412 am: 8e7f47329d -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah-kernel/+/25008399
Change-Id: Ie0e901b8e8fed8e74729f4089a0f5c4d6f3c3654
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah-kernel/+/25008399
Change-Id: I0f772d7ab1598858d5d5a4d8a8ca282b9415c7ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
Linux version 5.10.177-android13-4-00003-ga7208022a7ea-ab10815828
(build-user@build-host) (Android (8508608, based on r450784e)
clang version 14.0.7
(https://android.googlesource.com/toolchain/llvm-project
4c603efb0cca074e9238af8b4106c30add4418f6), LLD 14.0.7) #1 SMP
PREEMPT Fri Sep 15 16:40:54 UTC 2023
prebuilts/misc: (228 changes)
ab2bd7e2 Merge "Move platform constraints to bazel_common_rules." into main
64344635 Move platform constraints to bazel_common_rules.
86d8e6bc Merge "Updating prebuilt androidx-media3 to 1.1.1" into main
7206fc24 Merge "Clean up obsolete aliases for Truth." into main
93695d3d Merge "Merge Android 14" into main
5edb6b70 Merge Android 14
e24667e9 Clean up obsolete aliases for Truth.
28226033 Merge "Update prebuilt platform protos for recent statsd changes." into main am: c43f2733d8
547d513d Merge "Update prebuilt platform protos for recent statsd changes." into main am: ecbb5a70cc
38fd48bd Updating prebuilt androidx-media3 to 1.1.1
96302143 Merge Android U (ab/10368041)
1db8f2b1 Merge "Import media3-test-utils:1.0.2 prebuilts" into main am: cd0bc3e970
abf79ab3 Merge "Make media3 prebuilts visible to cts/tests/tests/mediaediting" into main am: 0c0ef76452
2e1847d1 Merge "Make media3 prebuilts visible to cts/tests/tests/mediacujtest" into main am: cbf04e1903
76d51fc4 Merge "Remove skip_preprocessed_apk_checks" into main am: fe65b4c1d8
e00a04e4 Merge "Make androidx.test.services.test-services preprocessed" into main am: 81c6b3f927
35087aa4 Merge "Import media3-exoplayer-dash:1.0.2 prebuilts" am: 9828f61222 am: 8940dc5ee7 am: b505f78fa9
b505f78f Merge "Import media3-exoplayer-dash:1.0.2 prebuilts" am: 9828f61222 am: 8940dc5ee7
a348180c Merge changes I4fdfe1bc,Id4a568dd,I4f116d6d,I25c49ffd,I5f8867f5, ... am: 9291e007b4 am: ce93e250cf am: 2e20f2e7a7
b939e223 Update androidx.media3 prebuilts to 1.0.2 and include UI module am: ccf9a8bbdf am: 86774721bf am: 9c498bda12
aff8207f Make media3 prebuilts visible to vendor/ projects am: 50859e1d38 am: 5be12d29a6 am: 4876847ec9
9635df31 Add (empty) visibility list to media3 prebuilts am: 66c2df7ad8 am: d67cd081a9 am: 8050a40912
e856cbe2 Update media3 prebuilts to 1.0.1 and import exoplayer am: c94defd92c am: b7bd3afaf3 am: 85e0a385c9
a8871b88 [automerger skipped] Import media3 1.0.0-beta03 session and common into prebuilts/misc/common am: d0311ab46e am: 49f75c223d am: e58e9f96b3 -s ours
bc95131d [automerger skipped] Update update-from-gmaven.py script from androidx.test to media3 am: 7f3d95f597 am: c8dde0ae49 am: 881f4ffe59 -s ours
589f4d12 [automerger skipped] Copy update-from-gmaven.py script from androidx-test to androidx-media3 am: 55498f65cf am: 0b137cec21 am: 166c6354a3 -s ours
2e20f2e7 Merge changes I4fdfe1bc,Id4a568dd,I4f116d6d,I25c49ffd,I5f8867f5, ... am: 9291e007b4 am: ce93e250cf
9c498bda Update androidx.media3 prebuilts to 1.0.2 and include UI module am: ccf9a8bbdf am: 86774721bf
4876847e Make media3 prebuilts visible to vendor/ projects am: 50859e1d38 am: 5be12d29a6
8050a409 Add (empty) visibility list to media3 prebuilts am: 66c2df7ad8 am: d67cd081a9
85e0a385 Update media3 prebuilts to 1.0.1 and import exoplayer am: c94defd92c am: b7bd3afaf3
e58e9f96 Import media3 1.0.0-beta03 session and common into prebuilts/misc/common am: d0311ab46e am: 49f75c223d
881f4ffe Update update-from-gmaven.py script from androidx.test to media3 am: 7f3d95f597 am: c8dde0ae49
166c6354 Copy update-from-gmaven.py script from androidx-test to androidx-media3 am: 55498f65cf am: 0b137cec21
350e1eef [automerger skipped] Merge "[DO NOT MERGE] Update tools-common prebuilt" am: 5afbf6b650 am: c482fe2000 am: 10f7c940a9 -s ours
1f532140 [automerger skipped] [DO NOT MERGE] Update tools-common prebuilt am: 4242c1a0b3 am: a30c5a7d24 am: 8f22f553f0 -s ours
10f7c940 Merge "[DO NOT MERGE] Update tools-common prebuilt" am: 5afbf6b650 am: c482fe2000
8f22f553 [DO NOT MERGE] Update tools-common prebuilt am: 4242c1a0b3 am: a30c5a7d24
ed622534 Merge "Revert "Update ddmlib prebuilt on 2023-04-26 02:02:07.595952"" am: 3d64b8eec6 am: 42bd56f328 am: 15f2747aa3
15f2747a Merge "Revert "Update ddmlib prebuilt on 2023-04-26 02:02:07.595952"" am: 3d64b8eec6 am: 42bd56f328
0ec1d682 Merge "Update ddmlib prebuilt on 2023-04-26 02:02:07.595952" am: 90f6f57b2e am: 5541caabd9 am: 86b17b9da9
86b17b9d Merge "Update ddmlib prebuilt on 2023-04-26 02:02:07.595952" am: 90f6f57b2e am: 5541caabd9
3ca3ef31 Merge "Revert "Update to androidx.test libraries released on 03.21.2023."" into udc-dev
c4afe7eb Revert "Update to androidx.test libraries released on 03.21.2023."
607d85c0 Merge "Update to androidx.test libraries released on 03.21.2023." into udc-dev
ed906ea9 Completely remove ITYPEs from winscope
9082e815 Update to androidx.test libraries released on 03.21.2023.
25114830 [automerger skipped] Merge "Merge Android 13 QPR2" am: 223ca21554 -s ours am: ce49937e61 -s ours am: e309721f68 -s ours
521266fe [automerger skipped] Merge Android 13 QPR2 am: 07a7bd3521 -s ours am: 3a9e8b78f4 -s ours am: cdbba3a060 -s ours
6a46bff3 Merge "Revert "Update ddmlib prebuilt on 2023-03-06 02:07:28.571082"" am: 0eb9c34a31 am: fd7d247ac2 am: 9d9e4e5985
a9ff6a62 Merge "Update ddmlib prebuilt on 2023-03-06 02:07:28.571082" am: 660de066c1 am: 4525d6ab43 am: d867c13f6b
bc87d01d Merge "Update androidx.test.runner to 1.5.3-alpha01" am: b08c85a39b am: 3d66851dc1 am: 010710d17b
ffb9d9f7 [automerger skipped] Merge changes from topic "am-322884bfb1ee47f482019283911a0b65" am: 8cee0e3ff5 -s ours am: 4dce2f6e60 -s ours am: dd6048d641 -s ours
99180864 [automerger skipped] Merge "Revert "Remove uiautomator version 2.2.0-alpha4"" into android13-tests-dev am: e4f0829735 -s ours am: bd9821f8cc -s ours am: 33fa7785df -s ours am: bbee78acda -s ours
ff3586bf Merge "Update ddmlib prebuilt on 2023-02-27 02:04:27.742966" am: c6b2851c28 am: 1d7b7d8622 am: ce5174ff41
69a79a0c [automerger skipped] Merge "Revert "Remove uiautomator version 2.2.0-alpha4"" into android13-tests-dev am: e4f0829735 am: b71d567eef am: 92bbf50ef8 -s ours am: 0cc499dbce -s ours am: d0ffe42777 -s ours
fcb2f716 [automerger skipped] Merge "Revert "Remove uiautomator version 2.2.0-alpha4"" into android13-tests-dev am: e4f0829735 am: b71d567eef am: 3f5810d310 -s ours
3f5810d3 Merge "Revert "Remove uiautomator version 2.2.0-alpha4"" into android13-tests-dev am: e4f0829735 am: b71d567eef
7cac3f1b [automerger skipped] Merge changes from topic "am-dcd22f11834f47e6a86e6252ca336bb9" am: 586c055038 -s ours am: 255228502d -s ours am: 2eb9522810 -s ours
9f96dacf [automerger skipped] Merge "Remove uiautomator version 2.2.0-alpha4" into android13-tests-dev am: 60583e6a18 -s ours am: 1fdd1b09ad -s ours am: 97f9d30aad -s ours am: fde845a72e -s ours
5aee4668 [automerger skipped] Merge "Remove uiautomator version 2.2.0-alpha4" into android13-tests-dev am: 60583e6a18 am: ee8c4076f6 am: a51c17ec8a -s ours am: 283d733d3e -s ours am: e95c95bb05 -s ours
6e5c8ccd [automerger skipped] Merge "Remove uiautomator version 2.2.0-alpha4" into android13-tests-dev am: 60583e6a18 am: ee8c4076f6 am: a792037463 -s ours
a7920374 Merge "Remove uiautomator version 2.2.0-alpha4" into android13-tests-dev am: 60583e6a18 am: ee8c4076f6
35812fdc Merge "Remove unused Robolectric's android-all-instrumented jar files" am: d8e44b9b36 am: ca4a3af924 am: 420c8cc390
1c0d17a1 Merge "Allow test-services.apk to be exposed for harness to use" am: ac8438bb3b am: 5d8e8a041a am: b257cba6df
73d88016 Merge "Remove unused android-all-o-preview-4-robolectric-0.jar" am: 3699d0e96b am: ec5f7c84aa am: b3d628d213
455d9aae Merge "Use official android-all for Android 12" am: 1f2b58ed78 am: a54b057d4d am: 72e054d901
fedc2bf3 Merge "Update ddmlib prebuilt on 2023-02-06 02:01:58.583807" am: 3cc38ef6c5 am: b331e25c7a am: 7c7e3b597f
6a947662 Merge "Add OWNERS to androidx-media3 prebuilts" am: 26e2248b9b am: 6befc3fe2f am: 5866570dec
7f170f8a Merge "Update ddmlib prebuilt on 2023-02-01 02:03:32.587613" am: 7a7c8c0314 am: 0fce0087dc am: 1d32f7724f
56b231c0 Merge "Import media3 1.0.0-beta03 session and common into prebuilts/misc/common"
f8a222e0 Merge "Update update-from-gmaven.py script from androidx.test to media3"
f83853ee Merge "Copy update-from-gmaven.py script from androidx-test to androidx-media3"
7f491cee Merge "Remove Q preview 4 android-all jar" am: 69eae3e671 am: 8dad257bb6 am: c483a6707a
395759ec Merge "Remove unused android-all-Q-robolectric-5415296.jar" am: c32b27ca03 am: 6a05726a42 am: 62295e2c07
5b64f561 Merge "Add Robolectric android-all for Android 12,12.1 and 13" am: baea0f437c am: 5111d79b39 am: 91936a07b9
351216a6 Import media3 1.0.0-beta03 session and common into prebuilts/misc/common
3dac9bed Update update-from-gmaven.py script from androidx.test to media3
8289dc9e Copy update-from-gmaven.py script from androidx-test to androidx-media3
d4f3e6e8 Merge "Update ddmlib prebuilt on 2023-01-30 02:04:26.496545" am: 7d3355b618 am: 3dff3b50a4 am: 3a67841eab
045df24d Update ATF prebuilt
ed2dfe04 Merge "Use official android-all for Android 11" am: a61d3b9d3c am: 9850c02983 am: 84f75881d1
2c5424b9 Merge "Add android-all 13 dependencies for update.gradle" am: b360730834 am: 17882c16a1 am: bf1c001b6d
db19c0c4 [automerger skipped] Remove uiautomator version 2.2.0-alpha4 am: ad9fdc9de6 -s ours am: 8f5bf91862 -s ours
81153e27 Merge "Delete commons-compress prebuilt." am: 1a6f922ba4 am: c1bd85759a am: f9790a1080
fe064f1d Merge "Update ddmlib prebuilt on 2023-01-18 02:03:30.283151" am: 6bb6a30c06 am: 6bdd4a968a am: 8523f490c7
1a11b5b6 [automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 am: 140a56c18c -s ours am: c348cf720b -s ours
77fb7a3b Merge "Update winscope file to support proxy version 1.0" am: fd3df53764 am: af7c888a11 am: 8153a14efa
4be51e47 Merge "Update ddmlib prebuilt on 2023-01-04 02:02:29.757123" am: dec26dba54 am: f6b8e457ec am: 6ab49e8a37
15224549 Merge "Update to androidx.test libraries released on Jan 3 2023." am: 86a49b649b am: 236e9b66c6 am: 643610fa36
3c8cd92a Test: atest MyRoboTests. am: 5d3e0d35c9 am: 91672ba945 am: 387141ee1b am: bd9777fe11
ef23cab9 Test: atest MyRoboTests. am: 5d3e0d35c9 am: 4bde723d50
4bde723d Test: atest MyRoboTests. am: 5d3e0d35c9
b65a4332 Merge "Update ddmlib prebuilt on 2022-12-19 02:02:32.972726" am: e69967c567 am: 0629fb3e7b am: 903077fbe8
92358bc5 Merge "Remove Robolectric prebuilts 4.5.1" am: f54b045aad am: fddafae63a am: 8934b7096e
203d50a1 Merge "Add android-all 12 and 12.1 dependencies for update.gradle" am: 8d5a5aaf5a am: 3b15d38481 am: bac0da674b
353a0803 Merge "Remove Robolectric prebuilt 4.4" am: 837074fdbe am: eff2366ec1 am: f794b1ddb1
9ee2e490 Merge "Delete deprecated Tradefed prebuilt." am: 0b670b5715 am: 66b9cdbde9 am: 15ccde22c0
de078f5e Merge "Delete Guava 21.0 prebuilt." am: a695d6bb16 am: 11d3983fa4 am: fd311c383c
fb4029ba Merge "Delete Jython prebuilt." am: 09c4fa2dfb am: 36a5a4658f am: 1086e00a2b
6ae6958a Merge "platform incompatible to prevent srcs==None error" am: 3f13fbc29f am: cb75f4d6c2 am: 0bc755fcf9
b19246f6 [automerger skipped] Enable new_robolectric am: 9c6e3515f6 am: fed042cd1b -s ours
fed042cd Enable new_robolectric am: 9c6e3515f6
253dc493 [automerger skipped] Enable new_robolectric am: 9c6e3515f6 am: 9718008403 am: a47deab64d -s ours am: cdb6a6f846 -s ours
3fb8a4c8 Merge "Add prebuilt of libprotobuf-cpp-full-3.9.1." am: aa16a21d1c am: c6c904eddb am: e25472aeaf
5cfaac8d Merge "Update to 11.08.2022 androidx.test stable release." am: 417e63e000 am: 86ad871e61 am: 36eebbb11f
95e65015 Merge "Remove Robolectric prebuild 4.3.1" am: df6aeb227c am: c4ffdbcd1c am: 8dd69cc86a
4e1f936b Merge "Remove Robolectric prebuild 3.6.2" am: d5fffb8054 am: 54be35e301 am: 17c2d83334
c9ea3de6 Merge "Remove unused Robolectric 3.6.1 artifacts" am: bc8011f45e am: e439430122 am: 7fe8da7d03
d7200cb0 Merge "Delete jsr305 prebuilt." am: 6d707fd18c am: e544307cbe am: 862a564fb3
a4313126 Merge "Delete icu4j prebuilt." am: a20b906192 am: 53efcf85ba am: 5275226a58
e2d67f66 Merge "Delete redundant error_prone_annotations prebuilt." am: cf8b2bb0a4 am: 57e73517b1 am: e3b09f5b1e
e521af3f Merge "Update prebuilts used by layoutlib"
8523aaeb [automerger skipped] Merge "[Cherry-pick] Update prebuilt platformprotos and platformtestprotos." am: 9e38d2e2a3 am: 070f1a4b10 am: 06f2b037f5 -s ours
99c3e5a7 Update prebuilts used by layoutlib
c6b2e161 Merge changes from topic "attribution_node"
80dd1306 Merge "Update ddmlib prebuilt on 2022-10-31 11:59:03.610966" am: ccd3ddf18f am: a64f5ab38e am: 60b8997b51
3bc77ba0 Merge "Remove malformed file." am: f0d73fd34d am: 9d47161583 am: 9832dc1718
678174b4 Merge "Update to androidx.test 10.26.2022 rc01 build" am: 2cf97195dd am: a279d56090 am: 565fee589e
1dce77f7 Merge "Remove androidx.test.uiautomator v2.2.0" am: a2963f280d am: a3d0ee500f am: 5a3f295edb
0bcd4680 Merge "Update to latest androidx.test artifacts." am: 6499ea4ef2 am: 009f4be162 am: cd817bee8c
cf8da711 [automerge] Update prebuilt platformprotos and platformtestprotos. 2p: 57f4fc4518
1847e3d0 Merge "Enable new_robolectric" am: 245b0e6534 am: 9d84458c26 am: addfd92621
57f4fc45 Update prebuilt platformprotos and platformtestprotos.
612cdecb Update layoutlib prebuilts without tools-common
c0b74fe4 Revert "Update layoutlib prebuilts"
8ede3115 Merge "Update ddmlib prebuilt on 2022-10-19 14:19:21.592631" am: 405069c040 am: acf9e21b31 am: b19e609761
6fea71ec Merge "Clean up license metadata, and add license texts." am: 4d40edaa25 am: b1d0b82901 am: 394bdf99ef
469d881d Update layoutlib prebuilts
e31c561a Merge "Add androidx.test.services:test-services apk." am: ebebc03451 am: d2c2a531dd am: 2697b47224
9d8f7d04 Merge "Revert "Update to new androidx.test beta artifacts released on 10.06.2022."" am: 5af149fd35 am: 5c8ba08315 am: be2c2665e6
d3a07e5b Merge "Update to new androidx.test beta artifacts released on 10.06.2022." am: c2ac164700 am: e6d7587b07 am: 8abddd2d1b
6c13f9b3 Merge "Update ddmlib-prebuilt.jar to unblock TF prebuilt drop" am: aa13429f07 am: 41ae3ae7a8 am: b2a9fbf04a
568235fe Merge "Remove common-prebuilt.jar" am: bd0d13bec6 am: 83a7c5fd24 am: 3c02d7e8bf
575e363e Mark tm-qpr-dev-plus-aosp-without-vendor@9129937 as merged am: 425201bb2c am: cf4e574abf
966445c5 Merge "Update ddmlib prebuilt on 2022-10-05 02:05:56.240896" am: 376de6474c am: 2ef5ae6da2 am: 233b478704 am: 8f7a763591 am: 4b2dfaaaf5
104177d2 Merge "Add instrumented SDK jars for Robolectric" am: 2ba90be5a0 am: ed4213ecee am: 742c6e259e am: 9c5fd2e0c7 am: 137533cdb5
5dd1a551 Merge changes Id428e290,I52a20766 am: 4572ef3a16 am: c53bfb6c95 am: d99a075115 am: cde5a26231 am: b29332e115
a79766ba Merge "Update Robolectric download scripts" am: ca5ffdb0ad am: 42887ad683 am: a7562e6888 am: 6a345a2635 am: c00bdda449
b960df5c Merge "Update ddmlib prebuilt on 2022-10-03 10:08:52.564995" am: 927051c3cc am: 3ca9720205 am: 757217a73d am: f9f50a36be am: b15458d376
f5fa50fc Merge "Update ddmlib prebuilt on 2022-09-26 02:07:09.845698" am: 659bd7cf5a am: ef7bb8547b am: 4a1da3fd31 am: 5ac7dcaa4f am: be66110fd7
793a0f63 Merge "Fix licenses -- no actual GPL" am: 24395c78dd am: 294684984e am: e96332b27e am: 7c88da061b am: 163af301b3
9f3243ec Merge "Drop new annotations jar needed" am: af7c0be9be am: 065c81a306 am: 7a45135359 am: cd2cee524c am: ee1c8b4c06
69107237 [automerge] Include Espresso accessibility library for Android Framework 2p: c74f330287
c74f3302 Include Espresso accessibility library for Android Framework
2158189b Include Espresso accessibility library for Android Framework
9b619d8b Merge "Remove outdated ANTLR prebuilt." am: c9046ddecb am: aea5d64e6a am: 68c3ea51bc am: 5ec645dede am: 537d2ee1df
775e5d2b Merge "Remove uiautomator version 2.2.0-alpha4" am: 42c81d65f6 am: 6e23729530 am: 3cb5df6ad5 am: 8a4b71805d am: 519c910220
b6fdb5a5 [automerger skipped] Merge "Update androidx.test prebuilts to latest." am: c43649e754 am: 1c5a98faf0 am: c50958bc91 am: 5c80c9c6ea am: 0881457872 -s ours
c7f5232d Add back license declaration.
ff605135 Update androidx.test prebuilts to latest.
51cc228f [automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: 51dd71ec2e -s ours am: cb6dd892d7 -s ours am: b68f0391ab -s ours am: 6336e5b913 -s ours
5dda8d48 [automerger skipped] DO NOT MERGE - Merge Android 13 am: 196c91bb2d -s ours am: 1118cdf74c -s ours am: f3577fffa5 -s ours am: c3512c1c85 -s ours
54496a10 Merge "Add BUILD file for yasm compiler" am: 44546f541f am: a56c2f6217 am: 8b5a467686 am: 8f466cdd98 am: f6012b97c7
ebe5a21b [automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: 320e01d8c8 -s ours am: 22681c314a -s ours am: be9f78ce53 -s ours am: 24095856a7 -s ours
f94cacb0 Merge "Update ddmlib prebuilt on 2022-05-25 02:03:37.323738" am: 2a8dc0712b am: 028a3ccf7b am: c5c5481f32 am: ee55006d65 am: 155dd97020
819c0c54 [automerger skipped] Merge "[DO NOT MERGE] Fix winscope on R" am: 45fbf11f45 am: 89181a94c6 am: 7adadbf8c9 -s ours am: 8bd8b591c2 -s ours am: 8674c26a88 -s ours am: 6479a88fae -s ours
2ed4831e [automerger skipped] [DO NOT MERGE] Fix winscope on R am: 8bcf476e55 am: 65ccb4dc67 am: 62ad5eb549 -s ours am: de64e83b1d -s ours am: 448317e005 -s ours am: 425b10b757 -s ours
3fd97b66 [automerger skipped] Merge "[DO NOT MERGE] Fix winscope on R" am: 45fbf11f45 am: 89181a94c6 am: 7adadbf8c9 -s ours am: 8bd8b591c2 -s ours am: b22551509f -s ours
e005889e [automerger skipped] [DO NOT MERGE] Fix winscope on R am: 8bcf476e55 am: 65ccb4dc67 am: 62ad5eb549 -s ours am: de64e83b1d -s ours am: cb192a59c2 -s ours
b2255150 [automerger skipped] Merge "[DO NOT MERGE] Fix winscope on R" am: 45fbf11f45 am: 89181a94c6 am: 7adadbf8c9 -s ours am: 8bd8b591c2 -s ours
cb192a59 [automerger skipped] [DO NOT MERGE] Fix winscope on R am: 8bcf476e55 am: 65ccb4dc67 am: 62ad5eb549 -s ours am: de64e83b1d -s ours
e85de1e8 Merge "Update ddmlib prebuilt on 2022-04-20 02:04:51.120735" am: 570fb179e7 am: 675de03651 am: c40a27f7b2 am: 5cebac5582 am: c883175b85 am: bb98daaf29
e3d4056b Merge "Update ddmlib prebuilt on 2022-04-20 02:04:51.120735" am: 570fb179e7 am: 675de03651 am: c40a27f7b2 am: 5cebac5582 am: 2873a2221d
2873a222 Merge "Update ddmlib prebuilt on 2022-04-20 02:04:51.120735" am: 570fb179e7 am: 675de03651 am: c40a27f7b2 am: 5cebac5582
98eb9f91 [automerger skipped] Empty merge of sc-v2-dev-plus-aosp-without-vendor@8433047 am: cc34ce9d75 -s ours am: a3d95864db -s ours am: e6fbcc590c -s ours am: 9ad739f5f9 -s ours
9ad739f5 [automerger skipped] Empty merge of sc-v2-dev-plus-aosp-without-vendor@8433047 am: cc34ce9d75 -s ours am: a3d95864db -s ours am: e6fbcc590c -s ours
65d9c510 [automerger skipped] Empty merge of sc-v2-dev-plus-aosp-without-vendor@8433047 am: cc34ce9d75 -s ours am: a3d95864db -s ours am: e6fbcc590c -s ours am: 541971e9a4 -s ours am: 026221ea46 -s ours
0009c352 Merge "Update ddmlib prebuilt on 2022-04-13 02:05:20.774627" am: 53d4d4f7cd am: df14df58cc am: 2de4ceec1c am: 47ad163419 am: da1f500d84 am: 5f38b6fbdf
b4288a33 Merge "Update ddmlib prebuilt on 2022-04-13 02:05:20.774627" am: 53d4d4f7cd am: df14df58cc am: 2de4ceec1c am: 47ad163419 am: b7b5d7b7b7
b7b5d7b7 Merge "Update ddmlib prebuilt on 2022-04-13 02:05:20.774627" am: 53d4d4f7cd am: df14df58cc am: 2de4ceec1c am: 47ad163419
d7b43445 [automerger skipped] Merge changes from topic "am-b40b36485948405484f981b5fc7ceaca" am: 9b98412ce0 -s ours am: 4a3e73d8c4 -s ours am: 0c2f7d2205 -s ours am: 1537eb1cd8 -s ours am: 2dcd92cd75 -s ours am: dbe7a1bb63 -s ours
6fbf9900 [automerger skipped] Merge "Mark ab/8389834 as merged" into android12L-tests-dev am: e4c92b76dc -s ours am: 18f26c9806 -s ours am: 14664acdec -s ours am: 169a77ea77 -s ours am: d6bddb95d8 -s ours am: d9fe5e3a19 -s ours am: 9c00f01157 -s ours
e95674af [automerger skipped] Merge changes from topic "am-b40b36485948405484f981b5fc7ceaca" am: 9b98412ce0 -s ours am: 4a3e73d8c4 -s ours am: 0c2f7d2205 -s ours am: 1537eb1cd8 -s ours am: 3a2442880a -s ours
ebd20047 [automerger skipped] Merge "Mark ab/8389834 as merged" into android12L-tests-dev am: e4c92b76dc -s ours am: 18f26c9806 -s ours am: 14664acdec -s ours am: 169a77ea77 -s ours am: d6bddb95d8 -s ours am: 5b3773f02d -s ours
3a244288 [automerger skipped] Merge changes from topic "am-b40b36485948405484f981b5fc7ceaca" am: 9b98412ce0 -s ours am: 4a3e73d8c4 -s ours am: 0c2f7d2205 -s ours am: 1537eb1cd8 -s ours
5b3773f0 [automerger skipped] Merge "Mark ab/8389834 as merged" into android12L-tests-dev am: e4c92b76dc -s ours am: 18f26c9806 -s ours am: 14664acdec -s ours am: 169a77ea77 -s ours am: d6bddb95d8 -s ours
3e3c8aa4 [automerger skipped] Merge Android 12 QPR3 ab/8391262 am: cc0cb20308 -s ours am: 358d8a028a -s ours am: 0a0ca17072 -s ours am: 018ac3a957 -s ours am: 2f138820cc -s ours
d8489670 [automerger skipped] Merge Android 12 QPR3 ab/8391262 am: cc0cb20308 -s ours am: 358d8a028a -s ours am: 0a0ca17072 -s ours am: 77c4c0f3ea -s ours
77c4c0f3 [automerger skipped] Merge Android 12 QPR3 ab/8391262 am: cc0cb20308 -s ours am: 358d8a028a -s ours am: 0a0ca17072 -s ours
741f5ab5 Merge "Non-module targets." am: 143ab4e539 am: d46fd39896 am: 035141cadf am: bf658bc0c9 am: abc0009b4f am: 36718e6a91
079e1b56 Merge "Non-module targets." am: 143ab4e539 am: d46fd39896 am: 035141cadf am: bf658bc0c9 am: 1392be8778
1392be87 Merge "Non-module targets." am: 143ab4e539 am: d46fd39896 am: 035141cadf am: bf658bc0c9
e5c14236 Merge "Update ddmlib prebuilt on 2022-03-30 02:02:47.222356" am: 892343a591 am: 40aff2ffd4 am: 036281b592 am: 5631c9529c am: a76f2b6d7f
978be092 Merge "Update ddmlib prebuilt on 2022-03-30 02:02:47.222356" am: 892343a591 am: 40aff2ffd4 am: 036281b592 am: 5631c9529c
a76f2b6d Merge "Update ddmlib prebuilt on 2022-03-30 02:02:47.222356" am: 892343a591 am: 40aff2ffd4 am: 036281b592 am: 5631c9529c
c039627e Merge "Update prebuilt platform protos for recent statsd changes." am: fff369c64d am: 60a5bf1483 am: cd091aa67a am: 9c2b425eba am: 7fe92c0545
dfcfef87 Merge "Update prebuilt platform protos for recent statsd changes." am: fff369c64d am: 60a5bf1483 am: cd091aa67a am: 9c2b425eba
7fe92c05 Merge "Update prebuilt platform protos for recent statsd changes." am: fff369c64d am: 60a5bf1483 am: cd091aa67a am: 9c2b425eba
af92c374 Merge "Update ddmlib prebuilt on 2022-03-23 02:03:15.380014" am: cd6dde48b9 am: 135853dd4e am: 6dbd3e0800 am: a8c2fa526b am: aa26040305
441db78e Merge "Update ddmlib prebuilt on 2022-03-23 02:03:15.380014" am: cd6dde48b9 am: 135853dd4e am: 6dbd3e0800 am: a8c2fa526b
aa260403 Merge "Update ddmlib prebuilt on 2022-03-23 02:03:15.380014" am: cd6dde48b9 am: 135853dd4e am: 6dbd3e0800 am: a8c2fa526b
a2df5f6c Merge "Update asm-7.0 to asm-9.2." am: 4e84d60d16 am: ca14330211 am: c8cf893ae2 am: 1789c9f4f7 am: 775692a1b1
fb82bff2 Merge "Update asm-7.0 to asm-9.2." am: 4e84d60d16 am: ca14330211 am: c8cf893ae2 am: 1789c9f4f7
775692a1 Merge "Update asm-7.0 to asm-9.2." am: 4e84d60d16 am: ca14330211 am: c8cf893ae2 am: 1789c9f4f7
815572ac Update winscope prebuilt am: 6d1f69883a am: e2089df0d4
e2089df0 Update winscope prebuilt am: 6d1f69883a
fd9e607a Update winscope prebuilt am: 6d1f69883a
29dd27d1 Merge "Update ddmlib prebuilt on 2022-03-09 02:01:38.280777" am: c3ed50aa0b am: 5578f51a96 am: f99d251fee am: 51633e1394 am: fd815917fc
fd815917 Merge "Update ddmlib prebuilt on 2022-03-09 02:01:38.280777" am: c3ed50aa0b am: 5578f51a96 am: f99d251fee am: 51633e1394
a0722038 Merge "Update ddmlib prebuilt on 2022-03-09 02:01:38.280777" am: c3ed50aa0b am: 5578f51a96 am: f99d251fee am: 51633e1394
3b315015 [automerger skipped] Merge "Merge Android 12L" am: ffcb3e4b74 -s ours am: 5489c4a65d -s ours am: dec48aa464 -s ours am: 030e447626 -s ours am: b5ad628dee -s ours
b6ea28cc [automerger skipped] Merge Android 12L am: ae7fefcf83 -s ours am: 08167050f6 -s ours am: 670711d298 -s ours am: f576ce6bfa -s ours am: 85d7e5472d -s ours
99ab97a8 [automerger skipped] Merge "Merge Android 12L" am: ffcb3e4b74 -s ours am: 5489c4a65d -s ours am: dec48aa464 -s ours am: 030e447626 -s ours
b5ad628d [automerger skipped] Merge "Merge Android 12L" am: ffcb3e4b74 -s ours am: 5489c4a65d -s ours am: dec48aa464 -s ours am: 030e447626 -s ours
1809bf92 [automerger skipped] Merge Android 12L am: ae7fefcf83 -s ours am: 08167050f6 -s ours am: 670711d298 -s ours am: f576ce6bfa -s ours
85d7e547 [automerger skipped] Merge Android 12L am: ae7fefcf83 -s ours am: 08167050f6 -s ours am: 670711d298 -s ours am: f576ce6bfa -s ours
510ed818 [LSC] Add LOCAL_LICENSE_KINDS to prebuilts/misc am: 7bba1789d1 am: 2e67f125aa
0039d07c [LSC] Add LOCAL_LICENSE_KINDS to prebuilts/misc am: 7bba1789d1
2e67f125 [LSC] Add LOCAL_LICENSE_KINDS to prebuilts/misc am: 7bba1789d1
5a16536a Merge "Update to latest androidx.test." into tm-dev am: 6e42bd573e am: 21f9836bb9
21f9836b Merge "Update to latest androidx.test." into tm-dev am: 6e42bd573e
a476dd5c Merge "Update to latest androidx.test." into tm-dev am: 6e42bd573e
3566377a Merge "Change commons-cli to support Android." into tm-dev am: 0ecfe9918d am: 645d845942
645d8459 Merge "Change commons-cli to support Android." into tm-dev am: 0ecfe9918d
1e4e4a2e Merge "Change commons-cli to support Android." into tm-dev am: 0ecfe9918d
21fdd817 Merge "Move comment to license_note" am: 12550579c1 am: 1b96553a27 am: 9261d6e305 am: c0ad9361ec am: b564b1963d
b564b196 Merge "Move comment to license_note" am: 12550579c1 am: 1b96553a27 am: 9261d6e305 am: c0ad9361ec
d09d0214 Merge "Move comment to license_note" am: 12550579c1 am: 1b96553a27 am: 9261d6e305 am: c0ad9361ec
e3439ea1 Merge "Revert "Uprev androidx.test.espresso to 3.5.0-alpha04 and fix de...""
cbe42655 Revert "Uprev androidx.test.espresso to 3.5.0-alpha04 and fix de..."
3679f566 Revert "Update androidx.test core, runner and ext libraries to latest."
19987325 Update androidx.test core, runner and ext libraries to latest.
06da1beb Uprev androidx.test.espresso to 3.5.0-alpha04 and fix dependencies
d691f2ee Merge "Update ddmlib prebuilt on 2022-02-23 02:01:34.235256" am: 24780712bc am: 81bd9bc2ef am: 176960388b am: 2992538988 am: 5461a8def2
3189d692 Merge "Update ddmlib prebuilt on 2022-02-23 02:01:34.235256" am: 24780712bc am: 81bd9bc2ef am: 176960388b am: 2992538988
5461a8de Merge "Update ddmlib prebuilt on 2022-02-23 02:01:34.235256" am: 24780712bc am: 81bd9bc2ef am: 176960388b am: 2992538988
c79ed8c1 Update layoutlib prebuilts
private/google-modules/aoc: (1 change)
6c07bf70 aoc: prevent out of range on find_ramdump_section
private/google-modules/gpu: (1 change)
fb192812 mali_kbase: platform: Add missing bounds check
Bug: 298264460
Bug: 302929196
Pick-Prebuilt: 572736412
Build-Id: 10937972
Processing-Config: kernel_headers
Merged-In: Ic0c01f05bb67b9a4ac34ed15683ad746616ec590
Change-Id: If230999361e95e6e2eb8be11951e628cfbbe1f1d
Signed-off-by: yixuanjiang <yixuanjiang@google.com>
|
|
Change-Id: Ib1cc3d02eb6d21c0dbb36243007895fda575154b
|
|
Change-Id: Id70f047652dd5c9cc93907bc17b861c9254ac57d
|
|
-s ours am: dd4a36892d -s ours am: 583e15d5a7 -s ours am: 7be775caef -s ours
am skip reason: Merged-In I10413c8f716e99a6279694894f021b1d9971546b with SHA-1 199db513a3 is already in history
Original change: https://android-review.googlesource.com/c/device/google/pantah-kernel/+/2774919
Change-Id: I799b2d2eb94d2c1624c77d4186362721b1115902
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
-s ours am: dd4a36892d -s ours am: 583e15d5a7 -s ours
am skip reason: Merged-In I10413c8f716e99a6279694894f021b1d9971546b with SHA-1 199db513a3 is already in history
Original change: https://android-review.googlesource.com/c/device/google/pantah-kernel/+/2774919
Change-Id: I599995772a80e5970abef5dd492332c909213474
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
-s ours am: dd4a36892d -s ours
am skip reason: Merged-In I10413c8f716e99a6279694894f021b1d9971546b with SHA-1 199db513a3 is already in history
Original change: https://android-review.googlesource.com/c/device/google/pantah-kernel/+/2774919
Change-Id: I69e9b7840a5f5a8cf21002f33e08d315ccc152ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
-s ours
am skip reason: Merged-In I10413c8f716e99a6279694894f021b1d9971546b with SHA-1 199db513a3 is already in history
Original change: https://android-review.googlesource.com/c/device/google/pantah-kernel/+/2774919
Change-Id: I8c001fbb6273dbdc6a444d8733e84fe93025607c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
am skip reason: Merged-In I10413c8f716e99a6279694894f021b1d9971546b with SHA-1 199db513a3 is already in history
Original change: https://android-review.googlesource.com/c/device/google/pantah-kernel/+/2774919
Change-Id: I7580f6311a9b4af6f931bfbdd3529aa2e9f0746c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
Linux version 5.10.177-android13-4-00002-gb4635069ea88-ab10883075
(build-user@build-host) (Android (8508608, based on r450784e)
clang version 14.0.7
(https://android.googlesource.com/toolchain/llvm-project
4c603efb0cca074e9238af8b4106c30add4418f6), LLD 14.0.7) #1 SMP
PREEMPT Fri Sep 29 11:08:06 UTC 2023
aosp: (2 changes)
b4635069 ANDROID: Update the ABI symbol list
48c8a33b ANDROID: sched: Add EXPORT_SYMBOL_GPL for sched_wakeup
prebuilts/boot-artifacts: (3 changes)
fbec6b44 Update the GKI binaries to ab/10883075
d1eef888 ramdisks: update the vendor ramdisk to ab/10887226
9b0137e3 ramdisks: update the vendor ramdisk to ab/10887226
private/google-modules/gpu: (5 changes)
d189615d mali_kbase: Fix OOB write in kbase_csf_cpu_queue_dump()
d2429d15 Merge android13-gs-pixel-5.10-udc-qpr1 into android13-gs-pixel-5.10-24Q1
241a3cfc mali_kbase: Move epoll-consumed waitqueue to struct kbase_file
4b239980 Integrate firmware core dump into sscd
f92aa3aa MIDCET-4870: Fix GPU page fault issue due to reclaiming of Tiler heap chunks
private/google-modules/lwis: (2 changes)
45dd856f IOEntry: Allow max wait time of 1 second
e65a97aa IO Entry: Support Wait and Poll in short interval functions
private/gs-google: (11 changes)
ece065ca Merge "Merge android13-5.10-2023-07 ab/10883075 into android13-gs-pixel-5.10-24Q1" into android13-gs-pixel-5.10-24Q1
dd66f0ab vh: sched: reduce check uclamp_fork_reset or prefer_idle
209e642b soc/google/cpif: Fix OOB access in pktproc perftest
879ac8aa Merge android13-5.10-2023-07 ab/10883075 into android13-gs-pixel-5.10-24Q1
6b931363 vh: sched: count number of adpf task correctly
c4e21bd3 vh: sched: refine code for inc/dec_adpf_counter
fea5e2ec arm64/dts: gs101/gs201: aoc: add entries for platform specific constants
63c73dca Merge android13-gs-pixel-5.10-udc-qpr1 into android13-gs-pixel-5.10-24Q1
b4635069 ANDROID: Update the ABI symbol list
48c8a33b ANDROID: sched: Add EXPORT_SYMBOL_GPL for sched_wakeup
9c2ce76d vh: sched: Use get_uclamp_fork_reset to check prefer idle
Bug: 275806676 (ACK)
Bug: 277090000
Bug: 281554683
Bug: 296839414
Bug: 297923758
Bug: 299991153
Bug: 300562856
Bug: 300750575
Bug: 300854197
Bug: 300957129
Bug: 302544486
Bug: 302552340
Bug: 302576694 (ACK)
Pick-Prebuilt: 571165899
Build-Id: 10910399
Processing-Config: kernel_headers
Change-Id: I22b90010ec9175891e30f98501ad4a45563ca66e
Signed-off-by: Pindar Yang <pindaryang@google.com>
|
|
Change-Id: I4fd749e73c83458e8011c3d0ed7b822ba6d28bbe
|
|
udc-qpr1-release
Change-Id: I35a3208fcb2b314a44fb9f962162b8329de172d5
|
|
Bug: 298295554
Merged-In: I10413c8f716e99a6279694894f021b1d9971546b
Change-Id: I478f0c85fb67816e3839693278c54258cbbcf2a6
|
|
MERGE ] am: 9cfac1107c am: 4e908482c7 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah-kernel/+/24946872
Change-Id: I797824076b2a7af12fd832ba5e0bbbdddd14ac42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah-kernel/+/24946872
Change-Id: I3647559952c8eaa31a94835a64e2e699a419bddf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
Linux version 5.10.177-android13-4-00003-ga7208022a7ea-ab10815828
(build-user@build-host) (Android (8508608, based on r450784e)
clang version 14.0.7
(https://android.googlesource.com/toolchain/llvm-project
4c603efb0cca074e9238af8b4106c30add4418f6), LLD 14.0.7) #1 SMP
PREEMPT Fri Sep 15 16:40:54 UTC 2023
private/google-modules/aoc: (1 change)
89b5a47b aoc: Disable SysMMU interrupts during GSA unloaded
Bug: 297627980
Pick-Prebuilt: 570894837
Build-Id: 10901672
Processing-Config: kernel_headers
Merged-In: Ic0c01f05bb67b9a4ac34ed15683ad746616ec590
Change-Id: Ia6ed355fd895a013656c5efe265ffa36189f6081
Signed-off-by: yixuanjiang <yixuanjiang@google.com>
|
|
MERGE ] am: f62cf3a9c9 am: 6e407474da -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah-kernel/+/24940327
Change-Id: Id38ff39ebbcb4846e1f77bb8041b636960ff513e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah-kernel/+/24940327
Change-Id: I50eff31c1a0bc3d50dbae6d1b6dd23ea20d90903
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
Linux version 5.10.177-android13-4-00003-ga7208022a7ea-ab10815828
(build-user@build-host) (Android (8508608, based on r450784e)
clang version 14.0.7
(https://android.googlesource.com/toolchain/llvm-project
4c603efb0cca074e9238af8b4106c30add4418f6), LLD 14.0.7) #1 SMP
PREEMPT Fri Sep 15 16:40:54 UTC 2023
private/google-modules/gpu: (1 change)
1896a2b4 mali_kbase: Zero-initialize the dump_bufs_meta array
private/google-modules/wlan/bcmdhd4389: (1 change)
c90b34fc bcmdhd: Fixed KP in stop pno path
Bug: 299226624
Bug: 299948695
Pick-Prebuilt: 570612531
Build-Id: 10900227
Processing-Config: kernel_headers
Merged-In: Ic0c01f05bb67b9a4ac34ed15683ad746616ec590
Change-Id: Ie46045a98d5cb506df7f008286b8c5ff753d6c1f
Signed-off-by: Isaac Chiou <isaacchiou@google.com>
|
|
Change-Id: I67036d1d704000cd53484729f25809bb8c5e242a
|
|
udc-qpr1-release
Change-Id: Iacb3f92566cb0fbd3d648adc80705dca1c4d9f4a
|
|
MERGE ] am: 43c62c0af8 am: b11a89b129 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah-kernel/+/24915991
Change-Id: Ib988973e787ab97b6d40641d861fcc139f13366e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah-kernel/+/24915991
Change-Id: I213e8dd1d27142200c0a9e7bd00bb00782168d0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
Linux version 5.10.177-android13-4-00003-ga7208022a7ea-ab10815828
(build-user@build-host) (Android (8508608, based on r450784e)
clang version 14.0.7
(https://android.googlesource.com/toolchain/llvm-project
4c603efb0cca074e9238af8b4106c30add4418f6), LLD 14.0.7) #1 SMP
PREEMPT Fri Sep 15 16:40:54 UTC 2023
prebuilts/boot-artifacts: (2 changes)
54bd776d ramdisks: update the vendor ramdisk to ab/10829584
427e2b2b ramdisks: update the vendor ramdisk to ab/10829584
prebuilts/misc: (2 changes)
c43f2733 Merge "Update prebuilt platform protos for recent statsd changes." into main
155597db Update prebuilt platform protos for recent statsd changes.
private/google-modules/aoc: (1 change)
c9dd2fed audio: support the VoIP reuse for the incall_cap0 EP
private/google-modules/bms: (3 changes)
a9fbd11f google_charger: add lock and log unexpected interval
54086a3d google_battery: add condition for the same marginal and need_rep threshold
6e1e2e5a google_battery: using different criteria for boundary checking in the bhi algorithm 3/5
private/google-modules/display: (3 changes)
f806f9f2 Merge "Merge android13-gs-pixel-5.10-udc into android13-gs-pixel-5.10-udc-qpr1" into android13-gs-pixel-5.10-udc-qpr1
04c26bb7 Merge android13-gs-pixel-5.10-udc into android13-gs-pixel-5.10-udc-qpr1
6474db0a panel: s6e3hc4: disable panel features before adjusting Vreg
private/google-modules/gpu: (3 changes)
241a3cfc mali_kbase: Move epoll-consumed waitqueue to struct kbase_file
f92aa3aa MIDCET-4870: Fix GPU page fault issue due to reclaiming of Tiler heap chunks
5dec6c2a mali_kbase: platform: Fix integer overflow
private/google-modules/touch/common: (2 changes)
9d099a1b gti: fix the race between irq and pm
7f921e8d gti: refine mutex lock for heatmap protection and frame reserving
private/gs-google: (7 changes)
9c2ce76d vh: sched: Use get_uclamp_fork_reset to check prefer idle
6fca39b0 vh_sched: cpu_freq: Applying rate limite logging
cb8df68e arm64/dts: raviole: remove google,bhi-algo-ver
81bce3c7 acpm: dynamically alloc irq_info to avoid invalid-access
08f9cbf0 arm64/dts: raviole/cloudripper: set bhi-status-marginal/need-rep 79
71c639ba vh: sched: fix imabalanced adpf counter
71b793d2 Revert "pcie: Setting XO clock to be always ON."
Bug: 289967462
Bug: 290072490
Bug: 291708247
Bug: 292447561
Bug: 294978951
Bug: 296839414
Bug: 296984851
Bug: 298137746
Bug: 299220425
Bug: 299407821
Bug: 300357268
Bug: 300479795
Bug: 300540450
Bug: 300562856
Bug: 300750575
Bug: 300957129
Bug: 301454348
Pick-Prebuilt: 570017271
Build-Id: 10882699
Processing-Config: kernel_headers
Merged-In: Ic0c01f05bb67b9a4ac34ed15683ad746616ec590
Change-Id: I1f8ead92db083f4e12bcd44336c17b1850de0a47
Signed-off-by: Varad Gautam <varadgautam@google.com>
|
|
Change-Id: I8dac41518d0c2c0109560015b3357980a7c34f2f
|
|
6e77e3c563 -s ours am: d60d442b59 -s ours am: 0d7e301fc3 -s ours
am skip reason: Merged-In I10413c8f716e99a6279694894f021b1d9971546b with SHA-1 2043161dcf is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah-kernel/+/24879895
Change-Id: I27906f72925ebfc497affa368660207ddd55c842
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
6e77e3c563 -s ours am: d60d442b59 -s ours
am skip reason: Merged-In I10413c8f716e99a6279694894f021b1d9971546b with SHA-1 2043161dcf is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah-kernel/+/24879895
Change-Id: Ie4c490cbd8b1f52900abed816b584946bf15caf2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
6e77e3c563 -s ours
am skip reason: Merged-In I10413c8f716e99a6279694894f021b1d9971546b with SHA-1 2043161dcf is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah-kernel/+/24879895
Change-Id: I36f82180e88c9665086c32fc3d4cf48bac395788
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
am skip reason: Merged-In I10413c8f716e99a6279694894f021b1d9971546b with SHA-1 2043161dcf is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah-kernel/+/24879895
Change-Id: I1795840e1a366cea53ead5268c4331ca0c767723
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
Change-Id: I0116a26626a4db40480826807f91e93c2b7de2b7
|
|
Bug: 291102124
Merged-In: I10413c8f716e99a6279694894f021b1d9971546b
Change-Id: If3f98c2fd6f9e4327e5f7b55d1b01f464f92b726
|
|
Linux version 5.10.177-android13-4-00001-g1c7ac0509362-ab10845082
(build-user@build-host) (Android (8508608, based on r450784e)
clang version 14.0.7
(https://android.googlesource.com/toolchain/llvm-project
4c603efb0cca074e9238af8b4106c30add4418f6), LLD 14.0.7) #1 SMP
PREEMPT Thu Sep 21 17:48:46 UTC 2023
aosp: (1 change)
1c7ac050 UPSTREAM: f2fs: fix iostat lock protection
prebuilts/boot-artifacts: (3 changes)
504f1a68 Update the GKI binaries to ab/10845082
871e1910 ramdisks: update the vendor ramdisk to ab/10856608
91c30f57 ramdisks: update the vendor ramdisk to ab/10856608
prebuilts/misc: (2 changes)
c43f2733 Merge "Update prebuilt platform protos for recent statsd changes." into main
155597db Update prebuilt platform protos for recent statsd changes.
private/google-modules/aoc: (4 changes)
cf1ea7b7 Merge android13-gs-pixel-5.10-udc-qpr1 into android13-gs-pixel-5.10-24Q1
c9dd2fed audio: support the VoIP reuse for the incall_cap0 EP
09fa9ec7 alsa: check the consumed data size in irq process functions
897e404f alsa: support dynamic stream type for pcm playback
private/google-modules/bms: (8 changes)
dcd52cb0 Merge android13-gs-pixel-5.10-udc-qpr1 into android13-gs-pixel-5.10-24Q1
a9fbd11f google_charger: add lock and log unexpected interval
54086a3d google_battery: add condition for the same marginal and need_rep threshold
6e1e2e5a google_battery: using different criteria for boundary checking in the bhi algorithm 3/5
07dea9a3 google_battery: bhi should use the aacr capacity without grace
3baaaafa max1720x_battery: save fg history with INI design capacity
945c62ab google_battery: set bhi_cycle_grace default 200 cycles
87c3b045 google_battery: remove index capping to 100
private/google-modules/display: (7 changes)
6009dfa0 Merge android13-gs-pixel-5.10-udc-qpr1 into android13-gs-pixel-5.10-24Q1
f806f9f2 Merge "Merge android13-gs-pixel-5.10-udc into android13-gs-pixel-5.10-udc-qpr1" into android13-gs-pixel-5.10-udc-qpr1
04c26bb7 Merge android13-gs-pixel-5.10-udc into android13-gs-pixel-5.10-udc-qpr1
936bc28e drm: samsung: support to suspend a decon without hibernation
cc624128 panel: add the progress type of mode switch & keep higher BTS while booting for RRS
203b4bbb display: s6e3hc4: delay DDIC DSC commands for RRS
6474db0a panel: s6e3hc4: disable panel features before adjusting Vreg
private/google-modules/gpu: (12 changes)
97449827 Merge "Merge android13-gs-pixel-5.10-udc-qpr1 into android13-gs-pixel-5.10-24Q1" into android13-gs-pixel-5.10-24Q1
7867fc53 Merge android13-gs-pixel-5.10-udc-qpr1 into android13-gs-pixel-5.10-24Q1
5dec6c2a mali_kbase: platform: Fix integer overflow
1d0b803c mali_kbase: Tracepoints for governor recommendation
869556c9 mali_kbase: Add tracepoints to hint_min_freq / hint_max_freq
d5d5c0f0 mali_kbase: Enable mali_kutf_clk_rate_trace_test_portal build
698c24a4 mali_kbase: restore CSF ftrace events
b89e4f20 Refactor helpers for creating RT threads
c6cb0a82 Merge "Merge r44p1-00dev3 from partner/upstream into android13-gs-pixel-5.10-udc-qpr1" into android13-gs-pixel-5.10-udc-qpr1
b6fd708b Merge r44p1-00dev3 from partner/upstream into android13-gs-pixel-5.10-udc-qpr1
e61eb932 Update KMD to 'mini release: update r44p1-00dev2 to r44p1-00dev3'
dacf004c Update KMD to 'mini release: update r44p1-01bet1 to r44p1-00dev2'
private/google-modules/touch/common: (3 changes)
0ca38db0 Merge android13-gs-pixel-5.10-udc-qpr1 into android13-gs-pixel-5.10-24Q1
9d099a1b gti: fix the race between irq and pm
7f921e8d gti: refine mutex lock for heatmap protection and frame reserving
private/google-modules/wlan/bcmdhd4389: (2 changes)
7bcd0a60 Merge android13-gs-pixel-5.10-udc-qpr1 into android13-gs-pixel-5.10-24Q1
aa13c699 bcmdhd: Check for send_mb_data function return value before calling wait for d3ack timeout function
private/gs-google: (32 changes)
3ef52841 Merge android13-5.10-2023-07 ab/10845082 into android13-gs-pixel-5.10-24Q1
8600ffbd Merge android13-gs-pixel-5.10-udc-qpr1 into android13-gs-pixel-5.10-24Q1
6fca39b0 vh_sched: cpu_freq: Applying rate limite logging
cb8df68e arm64/dts: raviole: remove google,bhi-algo-ver
1c7ac050 UPSTREAM: f2fs: fix iostat lock protection
81bce3c7 acpm: dynamically alloc irq_info to avoid invalid-access
08f9cbf0 arm64/dts: raviole/cloudripper: set bhi-status-marginal/need-rep 79
71c639ba vh: sched: fix imabalanced adpf counter
71b793d2 Revert "pcie: Setting XO clock to be always ON."
555321c0 Merge android13-5.10-2023-07 ab/10815828 into android13-gs-pixel-5.10-udc-qpr1
b0825277 vh: sched: Only force freq update if uclamp_max decreased
e6b92b24 vh: sched: Ignore vendor group uclamp_max for latency sensitive tasks
039f32fa vh: sched: Don't ignore latency sensitive task in uclamp filters
063614af vh: sched: Don't apply_uclamp_filters() to stopper task
d06ab15e vh: sched: Fix reset UCLAMP_FLAG_IDLE after uclamp_rq_inc_id()
34d18f38 arm64/dts: raviole/cloudripper: set bhi-cycle-grace 200 cycle
89330410 sched: vh: Add a new knob to modify teo util_threshold
ad28e422 usb: typec: usb_psy: Add new sysfs attribute to select sdp alarm timeout
b9af9cf4 vh: sched: Reduce overhead of calling uclamp_eff_value()
10d745e6 vh: sched: Inline functions in hot enqueue_task path
8700aa35 vh: sched: Reduce overhead of sugov_update_shared
80477475 vh: sched: Don't call sched_tp unconditionally
f634ef71 Merge "Merge android13-5.10-2023-07 ab/10793907 into android13-gs-pixel-5.10-udc-qpr1" into android13-gs-pixel-5.10-udc-qpr1
eba1aad8 vh: sched: Always let ADPF task prefer idle
29b0c2f8 Merge android13-5.10-2023-07 ab/10793907 into android13-gs-pixel-5.10-udc-qpr1
77120880 vh: sched: let binder inherit uclamp_fork_reset flag
3999263c Merge "Merge android13-gs-pixel-5.10-udc into android13-gs-pixel-5.10-udc-qpr1" into android13-gs-pixel-5.10-udc-qpr1
95f2bb7a Merge android13-gs-pixel-5.10-udc into android13-gs-pixel-5.10-udc-qpr1
db9656e0 drivers: devfreq: Remove memlat spam logs
159d4927 Revert "drivers: devfreq: Remove memlat spam logs"
1b698205 Merge android13-5.10-2023-03 ab/10726765 into android13-gs-pixel-5.10-udc
cdb564cd UPSTREAM: net/sched: cls_fw: Fix improper refcount update leads to use-after-free
Bug: 267388752
Bug: 275687235
Bug: 283402753
Bug: 283929569
Bug: 289967462
Bug: 290072490
Bug: 290783303
Bug: 290882327
Bug: 291066975
Bug: 291708247
Bug: 291843613
Bug: 291855615
Bug: 292252062
Bug: 292447561
Bug: 294195335
Bug: 294978951
Bug: 295546940
Bug: 295561932
Bug: 295941772
Bug: 296404527
Bug: 296744776
Bug: 296984851
Bug: 297496375
Bug: 297799749
Bug: 298137746
Bug: 299220425
Bug: 299378713
Bug: 299407821
Bug: 299467059
Bug: 300357268
Bug: 300478032
Bug: 300479795
Bug: 300540450
Bug: 300562856
Bug: 300854197
Bug: 300957129
Bug: 301181396 (ACK)
Bug: 301454303 (ACK)
Bug: 301454348
Pick-Prebuilt: 568695773
Build-Id: 10864669
Processing-Config: kernel_headers
Change-Id: I49e16757e145abe1944a659ae4aae1bd76ff7425
Signed-off-by: Pindar Yang <pindaryang@google.com>
|
|
Change-Id: Idec7caf7017a740de1fde22b41086ef22654cfd9
|
|
Linux version 5.10.177-android13-4-00003-ga7208022a7ea-ab10815828
(build-user@build-host) (Android (8508608, based on r450784e)
clang version 14.0.7
(https://android.googlesource.com/toolchain/llvm-project
4c603efb0cca074e9238af8b4106c30add4418f6), LLD 14.0.7) #1 SMP
PREEMPT Fri Sep 15 16:40:54 UTC 2023
private/google-modules/display: (1 change)
209fc208 display: nt37290: update refresh rate when enabling panel
private/gs-google: (1 change)
29faebc1 arm64/dts: gs101: Statically assign i2c bus numbers
Bug: 291606723
Bug: 297581026
Pick-Prebuilt: 568227592
Build-Id: 10849461
Processing-Config: kernel_headers
Change-Id: Iae5e908c56c3153b5e90d9078a16856f08f94d1a
Signed-off-by: Will McVicker <willmcvicker@google.com>
|
|
Change-Id: Ic8fccd094df8b71fe208a421d6b90d5942ac251a
|
|
udc-qpr1-release
Change-Id: Ib534442b95cdfddc3fd8942b40ba152e42a32b09
|
|
MERGE ] am: b6f4197c63 am: e0419b9a7f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah-kernel/+/24819050
Change-Id: I992192560447ff21f2a9d0bfa00a7f82938eee2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah-kernel/+/24819050
Change-Id: I8c441e6818c42de32c00b47424125b7937fb51bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
Change-Id: I13685bf23bac60eb78766a6575ae33c3a31c2f48
|
|
Linux version 5.10.177-android13-4-00003-ga7208022a7ea-ab10815828
(build-user@build-host) (Android (8508608, based on r450784e)
clang version 14.0.7
(https://android.googlesource.com/toolchain/llvm-project
4c603efb0cca074e9238af8b4106c30add4418f6), LLD 14.0.7) #1 SMP
PREEMPT Fri Sep 15 16:40:54 UTC 2023
private/gs-google: (5 changes)
8cdd6e0f Revert "drivers: devfreq: Remove memlat spam logs"
3b5fda15 sched: vh: Add a new knob to modify teo util_threshold
76f33a51 Revert "vh: sched: Simplify newidle_balance logic"
7ea600c4 Revert "vh: sched: Fix wrong locking in newidle_balance"
02a9fe25 Revert "vh: sched: Don't release this_rq lock in newidle_balance"
Bug: 297496375
Bug: 299467059
Bug: 301179625
Pick-Prebuilt: 567298321
Build-Id: 10844027
Processing-Config: kernel_headers
Change-Id: If53dbb45386159420260df5d8cf4dcf865668aae
Signed-off-by: Qais Yousef <qyousef@google.com>
|
|
Linux version 5.10.177-android13-4-00003-ga7208022a7ea-ab10815828
(build-user@build-host) (Android (8508608, based on r450784e)
clang version 14.0.7
(https://android.googlesource.com/toolchain/llvm-project
4c603efb0cca074e9238af8b4106c30add4418f6), LLD 14.0.7) #1 SMP
PREEMPT Fri Sep 15 16:40:54 UTC 2023
aosp: (3 changes)
a7208022 UPSTREAM: tcpm: Avoid soft reset when partner does not support get_status
53314a3d UPSTREAM: usb: typec: tcpm: Fix response to vsafe0V event
42df7835 ANDROID: KVM: arm64: Don't update IOMMUs for share/unshare
prebuilts/boot-artifacts: (1 change)
257ec98f Update the GKI binaries to ab/10815828
private/gs-google: (9 changes)
f103b3ee Merge android13-5.10-2023-07 ab/10815828 into android13-gs-pixel-5.10-24Q1
21e5cd29 vh: sched: add new vendor hook update_misfit_status
60589a11 vh: sched: Don't release this_rq lock in newidle_balance
1312285d vh: sched: Fix wrong locking in newidle_balance
1aa28b35 vh: sched: Simplify newidle_balance logic
cfe56e04 vh: sched: put vendor sched procfs nodes into layered directories
a7208022 UPSTREAM: tcpm: Avoid soft reset when partner does not support get_status
53314a3d UPSTREAM: usb: typec: tcpm: Fix response to vsafe0V event
42df7835 ANDROID: KVM: arm64: Don't update IOMMUs for share/unshare
Bug: 261701366
Bug: 265339154 (ACK)
Bug: 281715990
Bug: 287641634
Bug: 289151587
Bug: 290878685 (ACK)
Bug: 291843613 (ACK)
Bug: 300458646 (ACK)
Bug: 300540960 (ACK)
Bug: 300543323 (ACK)
Pick-Prebuilt: 567142862
Build-Id: 10837550
Processing-Config: kernel_headers
Change-Id: I258aae03835da7aae1583befa2f27e8f1c4bac0c
Signed-off-by: Pindar Yang <pindaryang@google.com>
|
|
Linux version 5.10.177-android13-4-00003-ga7208022a7ea-ab10815828
(build-user@build-host) (Android (8508608, based on r450784e)
clang version 14.0.7
(https://android.googlesource.com/toolchain/llvm-project
4c603efb0cca074e9238af8b4106c30add4418f6), LLD 14.0.7) #1 SMP
PREEMPT Fri Sep 15 16:40:54 UTC 2023
aosp: (3 changes)
a7208022 UPSTREAM: tcpm: Avoid soft reset when partner does not support get_status
53314a3d UPSTREAM: usb: typec: tcpm: Fix response to vsafe0V event
42df7835 ANDROID: KVM: arm64: Don't update IOMMUs for share/unshare
prebuilts/boot-artifacts: (1 change)
b0fb429b Update the GKI binaries to ab/10815828
private/google-modules/aoc: (2 changes)
09fa9ec7 alsa: check the consumed data size in irq process functions
897e404f alsa: support dynamic stream type for pcm playback
private/google-modules/bms: (3 changes)
07dea9a3 google_battery: bhi should use the aacr capacity without grace
3baaaafa max1720x_battery: save fg history with INI design capacity
945c62ab google_battery: set bhi_cycle_grace default 200 cycles
private/google-modules/display: (1 change)
936bc28e drm: samsung: support to suspend a decon without hibernation
private/google-modules/wlan/bcmdhd4389: (1 change)
aa13c699 bcmdhd: Check for send_mb_data function return value before calling wait for d3ack timeout function
private/gs-google: (10 changes)
555321c0 Merge android13-5.10-2023-07 ab/10815828 into android13-gs-pixel-5.10-udc-qpr1
b0825277 vh: sched: Only force freq update if uclamp_max decreased
e6b92b24 vh: sched: Ignore vendor group uclamp_max for latency sensitive tasks
039f32fa vh: sched: Don't ignore latency sensitive task in uclamp filters
063614af vh: sched: Don't apply_uclamp_filters() to stopper task
d06ab15e vh: sched: Fix reset UCLAMP_FLAG_IDLE after uclamp_rq_inc_id()
34d18f38 arm64/dts: raviole/cloudripper: set bhi-cycle-grace 200 cycle
a7208022 UPSTREAM: tcpm: Avoid soft reset when partner does not support get_status
53314a3d UPSTREAM: usb: typec: tcpm: Fix response to vsafe0V event
42df7835 ANDROID: KVM: arm64: Don't update IOMMUs for share/unshare
Bug: 265339154 (ACK)
Bug: 267388752
Bug: 283402753
Bug: 290878685 (ACK)
Bug: 291843613 (ACK)
Bug: 294195335
Bug: 295546940
Bug: 295561932
Bug: 296404527
Bug: 296744776
Bug: 300458646 (ACK)
Bug: 300478032
Bug: 300540960 (ACK)
Bug: 300543323 (ACK)
Pick-Prebuilt: 567142862
Build-Id: 10837549
Processing-Config: kernel_headers
Merged-In: Ic0c01f05bb67b9a4ac34ed15683ad746616ec590
Change-Id: I5b360979b176767257becd127edb1935c9cd8b50
Signed-off-by: Pindar Yang <pindaryang@google.com>
|
|
udc-qpr1-release
Change-Id: I165f915eba9e4fbcde93da1bd0bdfec94326e0b6
|
|
MERGE ] am: 6ad50c4763 am: 619468d0f5 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah-kernel/+/24791977
Change-Id: Iea1bc0431e52e40cbb495805892c84363fbc5608
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah-kernel/+/24791977
Change-Id: Id8acfca9bc6206f1f3f6f5fb4567f63980aa4c7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
|
udc-qpr1-release
Change-Id: Icd9462d96c8c1dbb3af782d001d3a2d214ed0ccf
|
