Xin Li
a0932dbfbe
Merge 2024-06 Release (ab/AP2A.240605.024) to aosp-main-future
...
Bug: 343100748
Merged-In: I9d64aa9d5630b90286c6336dd95ef1e2c9e43910
Change-Id: I085b9bae6ea33c255634fe4406b41bf9f3502efe
2024-06-05 14:12:12 -07:00
Cyan_Hsieh
0811a1be0b
Switch makefile owners to MK_OWNERS am: 46ea9b3a35
...
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/3107246
Change-Id: I88e3a145988d3aca84e5a18ac3274af497f3fcb4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 14:29:15 +00:00
Cyan_Hsieh
46ea9b3a35
Switch makefile owners to MK_OWNERS
...
Bug: 278167548
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:9bab86ac7deaae3497b3b75ef7d3d8976ff20894 )
Merged-In: I141c255cad00dd9dcd9c3491e5bd3b18a9c9fcfd
Change-Id: I141c255cad00dd9dcd9c3491e5bd3b18a9c9fcfd
2024-05-29 10:00:04 +00:00
Alice Wang
acd52c1113
Disable AVF remote attestation on bluejay devices am: c4d47798ba
...
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/3093345
Change-Id: If6e24c78ea699b8cb76fa26cd58ebb19c7d4d85d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-27 08:57:17 +00:00
Alice Wang
c4d47798ba
Disable AVF remote attestation on bluejay devices
...
The VM DICE chain support required by AVF remote
attestation is only introduced from Pixel 7.
Bug: 341292601
Test: run VM remote attestation on Pixel 6 and check it is
disabled
Change-Id: I820fdd2b9d84986a30350606eca805668d007997
2024-05-23 14:09:18 +00:00
Xin Li
68780eed4b
Merge Android 24Q2 Release (ab/11526283) to aosp-main-future
...
Bug: 337098550
Merged-In: I0f2eb66bc3830f68b3cfac6fdedaad6893bf538f
Change-Id: I0b6d2f41f985bbbd07667b030efedcc62804fcbe
2024-05-06 12:09:14 -07:00
Android Build Coastguard Worker
2c611bad7b
Merge cherrypicks of ['googleplex-android-review.googlesource.com/26243174', 'googleplex-android-review.googlesource.com/26242507', 'googleplex-android-review.googlesource.com/26244092', 'googleplex-android-review.googlesource.com/26465284'] into 24Q2-release.
...
Change-Id: I61d26bb70bf888c46e1b6a7bfec50bfe52c0ba7e
2024-03-26 23:37:33 +00:00
Ankur Bakshi
ab2d50ac00
Update bluejay SVN to 61
...
Bug: 325156176
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:9a8f074c0140915dfd0948d0d0663458e72ad3f0 )
Merged-In: I9d64aa9d5630b90286c6336dd95ef1e2c9e43910
Change-Id: I9d64aa9d5630b90286c6336dd95ef1e2c9e43910
2024-03-26 23:24:13 +00:00
Ankur Bakshi
2fa60b0106
Update bluejay SVN to 60
...
Bug: 325156176
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:cc1a8946436212346ed46d92c45ce046ce6b84bd )
Merged-In: I4b8eb00b66dbc3f794f1678b5d5edcfea5fd49b3
Change-Id: I4b8eb00b66dbc3f794f1678b5d5edcfea5fd49b3
2024-03-26 23:23:58 +00:00
Ankur Bakshi
c90c7d32a7
Update bluejay SVN to 59
...
Bug: 325156176
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:8b3b8cfbb484ac7a1b504cf4b9ea4df29b5c0aff )
Merged-In: Ia7c000f30bb7d19830c83596e9dda76f91debb28
Change-Id: Ia7c000f30bb7d19830c83596e9dda76f91debb28
2024-03-26 23:23:41 +00:00
Ankur Bakshi
41f94a4ab9
Update bluejay SVN to 58
...
Bug: 325156176
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:6c243941ba9cbe0835f377f6a95ed1d29e90c94f )
Merged-In: I2b77dc5a7ddeb6e082710a2515ea1a3398d1fe58
Change-Id: I2b77dc5a7ddeb6e082710a2515ea1a3398d1fe58
2024-03-26 23:23:24 +00:00
Android Build Coastguard Worker
000a3eca76
Merge cherrypicks of ['googleplex-android-review.googlesource.com/26014701'] into 24Q2-release.
...
Change-Id: Id0c9b007842344e821289555f517d2915f38e9f6
2024-03-20 21:30:07 +00:00
Cheng Chang
12532424b2
gps: Disable Vzw SUPL OTDOA
...
Bug: 322404137
Test: OTDOA test in b/322404137
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:7b53f7cfb9aef092f88a0461aae50519f2931d3d )
Merged-In: Ia9ce30833ebf24455388fe8a3920d7d91946a35e
Change-Id: Ia9ce30833ebf24455388fe8a3920d7d91946a35e
2024-03-20 21:22:50 +00:00
Xin Li
f376ccdc73
[automerger skipped] Merge Android 14 QPR2 to AOSP main am: fdfc8cbe63
-s ours
...
am skip reason: Merged-In Ib4f988604c5d6275a36e6e0431a9c214682c23df with SHA-1 5e0ebb4dc4
is already in history
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2990105
Change-Id: I8ca45b37f1168adf20aeae41c080357baf1a9f5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-07 09:55:14 +00:00
Xin Li
fdfc8cbe63
Merge Android 14 QPR2 to AOSP main
...
Bug: 319669529
Merged-In: Ib4f988604c5d6275a36e6e0431a9c214682c23df
Change-Id: I9d9ac0a8a57e5ce259f7a0c9713c9e0efc481997
2024-03-06 09:29:46 -08:00
Android Build Coastguard Worker
f6285152d0
Snap for 11520864 from 38b715bcc7
to 24Q2-release
...
Change-Id: I685368d946bca4a9a4660b2358fc9406e75bf68f
2024-03-02 02:01:42 +00:00
Treehugger Robot
38b715bcc7
Merge "Enabling Observe mode" into main
2024-03-01 00:29:10 +00:00
Android Build Coastguard Worker
fcdde365bb
Snap for 11517367 from f2aa913897
to 24Q2-release
...
Change-Id: I05554fda591fbb1619ade5ebeecff5f9eacb9347
2024-03-01 00:01:58 +00:00
Brad Lassey
407ac994ea
Enabling Observe mode
...
Bug: 327601464
Test: Tested on local device
Change-Id: I0f2eb66bc3830f68b3cfac6fdedaad6893bf538f
2024-02-29 20:07:17 +00:00
Treehugger Robot
f2aa913897
Merge "Initial Bootloader prebuilt for AP3% build" into main
2024-02-29 17:52:00 +00:00
Cyan_Hsieh
f991ab19ee
Initial Bootloader prebuilt for AP3% build
...
Bug: 326002225
Change-Id: Ie8770c1baa71f8e417097889dbbab66ccd3a1f82
2024-02-27 16:24:33 +08:00
Android Build Coastguard Worker
8103014178
Snap for 11469542 from 923d36430f
to 24Q2-release
...
Change-Id: Ifc7c54c53be9260de2638f4b366b7ed076ee2fc6
2024-02-20 00:01:43 +00:00
George Chang
923d36430f
Enable NFC firmware logging
...
Enable NFC firmware logging by default for better debuggability.
Bug: 307999188
Bug: 325604333
Test: manual
Change-Id: I28b75274b65f741e6b57cdd42a4c7eafedcb0351
2024-02-19 07:05:17 +00:00
Android Build Coastguard Worker
a9a7bf0f6a
Merge "Snap for 11456215 from 0f42293165
to 24Q2-release" into 24Q2-release
2024-02-16 01:40:29 +00:00
Android Build Coastguard Worker
26434d583f
Snap for 11456215 from 0f42293165
to 24Q2-release
...
Change-Id: I58310ca748495606e8e780cd24d941fec6b14260
2024-02-16 00:32:32 +00:00
Android Build Coastguard Worker
0992cdb94e
Snap for 11456215 from 0f42293165
to 24Q2-release
...
Change-Id: Ie101032e1137ec33a5ccb55df1220da56a0e3f1d
2024-02-16 00:20:33 +00:00
Ankur Bakshi
0f42293165
Merge "Update bluejay SVN to 57" into main
2024-02-14 19:18:22 +00:00
Ankur Bakshi
3e719e802f
Update bluejay SVN to 57
...
Bug: 313797924
Change-Id: If12eb28985d45f9d05c38eb429074c0a15dc6a1c
2024-02-14 00:05:54 +00:00
Android Build Coastguard Worker
dd810fee4c
Snap for 11420186 from 128ba0f817
to 24Q2-release
...
Change-Id: I8cf7838520f9b8748bda9fecf79ad53853a94852
2024-02-08 00:02:09 +00:00
Jacky Liu
128ba0f817
Update i2c device paths
...
Update i2c device paths with static bus numbers.
Also remove some redundant paths.
Bug: 323447554
Test: Boot to home
Change-Id: I43e374230258ae172677c993405d15763895a991
Signed-off-by: Jacky Liu <qsliu@google.com>
2024-02-06 16:17:49 +00:00
Android Build Coastguard Worker
64817ef84f
Snap for 11386701 from d93e988c35
to 24Q2-release
...
Change-Id: Ifa5877f48790e4ac709760e08cdcdd41dd659e31
2024-02-01 00:01:27 +00:00
Xin Li
d93e988c35
[automerger skipped] Merge Android 24Q1 Release (ab/11220357) am: 5e0ebb4dc4
-s ours
...
am skip reason: Merged-In I72349a14a2fa1766ca6c2de28b2ec376ab59f99a with SHA-1 e765ab049d
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/25972592
Change-Id: Ib3658c1877a6d68ddc484f9a2eea068305dd3431
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-31 02:02:48 +00:00
Android Build Coastguard Worker
da4c87e50f
Snap for 11380007 from 93e6833f44
to 24Q2-release
...
Change-Id: Ifdf89e592ad9698440e2bffefdf1dcd2834a2371
2024-01-31 00:01:43 +00:00
Ankur Bakshi
93e6833f44
Merge "Update bluejay SVN to 56" into main
2024-01-30 18:49:25 +00:00
Android Build Coastguard Worker
1d3aa4f55d
Snap for 11373247 from b9438cfd24
to 24Q2-release
...
Change-Id: I20c19dbaa130fc58f0745839c50d412f352f073b
2024-01-30 02:02:05 +00:00
Ankur Bakshi
b9438cfd24
[automerger skipped] Update bluejay SVN to 55 am: aff08c6fac
-s ours
...
am skip reason: Merged-In Ie828075b65f51b1bb8109c0a330542b0f620b7ca with SHA-1 2cc93e92b3
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/26024605
Change-Id: I5abde1a9a896cee39f172a38e46320f7800c600b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-29 19:46:03 +00:00
Darren Hsu
04a4c33897
powerstats: use display MRR state residency data provider
...
Bug: 322717818
Test: vts-tradefed run vts -m VtsHalPowerStatsTargetTest
Change-Id: I67e9659e37bd34100a6be5d6352f4dc6341d628b
Signed-off-by: Darren Hsu <darrenhsu@google.com>
2024-01-29 11:40:24 +08:00
Ankur Bakshi
3202044230
Update bluejay SVN to 56
...
Bug: 313797924
Change-Id: I10044f7258e9989cd16b3ba05fc39a3965e4aad4
2024-01-28 00:30:54 +00:00
Ankur Bakshi
aff08c6fac
Update bluejay SVN to 55
...
Bug: 313797924
Change-Id: Ie828075b65f51b1bb8109c0a330542b0f620b7ca
(cherry picked from commit 2cc93e92b3
)
Merged-In: Ie828075b65f51b1bb8109c0a330542b0f620b7ca
2024-01-26 21:30:21 +00:00
Android Build Coastguard Worker
96993388ed
Snap for 11348195 from c956bde435
to 24Q2-release
...
Change-Id: Ib384d72bf4e21207cc96297d43061e52ea9725c2
2024-01-24 00:02:45 +00:00
Beverly
c956bde435
Update pixel pitch for device
...
Bug: 319894241
Flag: ACONFIG com.android.systemui.device_entry_udfps_refactor DEVELOPMENT
Test: manual
Change-Id: Ib67834c34a874284080e3e26c7597fe18216c3ed
2024-01-19 16:40:00 +00:00
Xin Li
5e0ebb4dc4
Merge Android 24Q1 Release (ab/11220357)
...
Bug: 319669529
Merged-In: I72349a14a2fa1766ca6c2de28b2ec376ab59f99a
Change-Id: Ib4f988604c5d6275a36e6e0431a9c214682c23df
2024-01-17 22:12:21 -08:00
Android Build Coastguard Worker
a25169f851
Snap for 11308440 from 1b721960ce
to 24Q2-release
...
Change-Id: Ie3bb0b51c6025ccaa15e823e41b44d4389ce5bf7
2024-01-13 02:07:33 +00:00
Becker (Chan-Ying) Lien
1b721960ce
Update ShannonIms CERTIFICATE to PRESIGNED am: 58f68f8a3c
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/25867464
Change-Id: If59f70ba6ec5697139c8809c23facc95c70edab5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-12 06:56:20 +00:00
Android Build Coastguard Worker
748c8b9958
Snap for 11302939 from f29ef2f46f
to 24Q2-release
...
Change-Id: I7526e6c0ae9a1f0e2908ad785922696a0ffccc13
2024-01-12 01:10:04 +00:00
Becker (Chan-Ying) Lien
58f68f8a3c
Update ShannonIms CERTIFICATE to PRESIGNED
...
This is a reland of 9b3e8fd791
which was
lost in ag/25432590
Bug: 298956897
Change-Id: Ic868be21343b87e0d65e218334ee64dc81a777d5
2024-01-11 15:07:30 -08:00
Cheng Chang
f29ef2f46f
gps: Update the aiding interval
...
Bug: 309119807
Test: Verification at b/309119807#comment44
Change-Id: I8cd98b28220e4a9ae3ded3d14443cec9c02b3460
2024-01-09 06:04:38 +00:00
Android Build Coastguard Worker
1bb2ed7643
Snap for 11275524 from b7fdfed893
to 24Q2-release
...
Change-Id: I5803f2acdc4822ef38dc75f5be1db940da6fd99d
2024-01-05 00:02:04 +00:00
Android Build Coastguard Worker
25a33aef37
Snap for 11255311 from 0bf4352732
to 24Q2-release
...
Change-Id: I1c7a1e34f7b2b4138c8129c335c71ec403d6b816
2023-12-27 00:03:30 +00:00
Aaron Ding
b7fdfed893
bluejay: control the kernel by release configuration
...
Bug: 317784824
Change-Id: Id556d4851f03a755f8c062b8be2d023de67125d3
Signed-off-by: Aaron Ding <aaronding@google.com>
2023-12-27 00:49:37 +08:00