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
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
Treehugger Robot
38b715bcc7
Merge "Enabling Observe mode" into main
2024-03-01 00:29:10 +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
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
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
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
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
Ankur Bakshi
93e6833f44
Merge "Update bluejay SVN to 56" into main
2024-01-30 18:49:25 +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
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
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
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
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
Carter Hsu
0bf4352732
audio: support incall capture dl/ul concurrent recording
...
Bug: 317726514
Test: Verified by test build
Change-Id: I4fa12659797778810b37819bb71ba2b09b757b45
Signed-off-by: Carter Hsu <carterhsu@google.com>
2023-12-26 00:58:38 +00:00
Ankur Bakshi
f97c864105
Merge "Update bluejay SVN to 55" into main
2023-12-20 04:18:36 +00:00
Cyan_Hsieh
e765ab049d
Branch bootloader prebuilts for 24Q2 release
...
Bug: 313350495
Change-Id: I72349a14a2fa1766ca6c2de28b2ec376ab59f99a
2023-12-13 08:34:46 +00:00
Treehugger Robot
1e6c17c489
[automerger skipped] Merge "Revert^2 "bluejay: Replace NFC app with NFC apex"" into main am: 9ed8f1c838
am: 6f1ec246bf
am: 692cf25016
-s ours
...
am skip reason: Merged-In Ibc741f24cc6d19adda3097d17bc81baf455f71d3 with SHA-1 35de536662
is already in history
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2863545
Change-Id: I891d0234ae0e30c13fbdd0ee73398317a8f29ad3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 23:23:21 +00:00
Treehugger Robot
12576f2147
[automerger skipped] Merge "Revert^2 "bluejay(nfc): Modify NFC overlays for NFC apex"" into main am: bf8ffb2c68
am: c70cb81a1a
am: 189134cc84
-s ours
...
am skip reason: Merged-In I443bcf2681437ec4a0caa3fdb5046ab856db0ddb with SHA-1 13426a9d37
is already in history
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2863495
Change-Id: Ia3a5ca0865bdd10e65360f8716264772a9a14121
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 23:23:05 +00:00
Xin Li
24ea019bb9
[automerger skipped] Merge Android 14 QPR1 am: 1c13e95346
-s ours am: 20b61831f1
-s ours am: b73add6ce4
-s ours
...
am skip reason: Merged-In Ib8c40e3ac85fb722adbe2ee4b7a2dadeba36c305 with SHA-1 e22d1ba5b6
is already in history
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2866377
Change-Id: Iafc5cf755aa6c75734aa825c2f0926aa0827e896
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 22:57:46 +00:00
Treehugger Robot
692cf25016
Merge "Revert^2 "bluejay: Replace NFC app with NFC apex"" into main am: 9ed8f1c838
am: 6f1ec246bf
...
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2863545
Change-Id: I80f198b7dcbef93eac6d312ee66d6a307e6d39d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 22:40:17 +00:00
Treehugger Robot
189134cc84
Merge "Revert^2 "bluejay(nfc): Modify NFC overlays for NFC apex"" into main am: bf8ffb2c68
am: c70cb81a1a
...
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2863495
Change-Id: I8ac1e88d5b7c1cb55f7ea20c7ba69688aca25975
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 22:40:04 +00:00
Treehugger Robot
6f1ec246bf
Merge "Revert^2 "bluejay: Replace NFC app with NFC apex"" into main am: 9ed8f1c838
...
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2863545
Change-Id: I9e990f1d600dc84b7fb3100c85e6032f43ce0ed2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 22:18:26 +00:00
Treehugger Robot
c70cb81a1a
Merge "Revert^2 "bluejay(nfc): Modify NFC overlays for NFC apex"" into main am: bf8ffb2c68
...
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2863495
Change-Id: I562c8d5919682668c75cec2d0eeef26c6a6b206a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 22:18:10 +00:00
Xin Li
b73add6ce4
[automerger skipped] Merge Android 14 QPR1 am: 1c13e95346
-s ours am: 20b61831f1
-s ours
...
am skip reason: Merged-In Ib8c40e3ac85fb722adbe2ee4b7a2dadeba36c305 with SHA-1 e22d1ba5b6
is already in history
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2866377
Change-Id: I3e0e095a016bdf641e5194b7baf1f18fd4f2836b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 22:02:34 +00:00
Treehugger Robot
9ed8f1c838
Merge "Revert^2 "bluejay: Replace NFC app with NFC apex"" into main
2023-12-11 22:00:34 +00:00
Treehugger Robot
bf8ffb2c68
Merge "Revert^2 "bluejay(nfc): Modify NFC overlays for NFC apex"" into main
2023-12-11 22:00:34 +00:00
Xin Li
20b61831f1
[automerger skipped] Merge Android 14 QPR1 am: 1c13e95346
-s ours
...
am skip reason: Merged-In Ib8c40e3ac85fb722adbe2ee4b7a2dadeba36c305 with SHA-1 e22d1ba5b6
is already in history
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2866377
Change-Id: If8887ac82ecabb11c7e600df5c9e5a9b6875216b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 21:16:45 +00:00
Xin Li
1c13e95346
Merge Android 14 QPR1
...
Merged-In: Ib8c40e3ac85fb722adbe2ee4b7a2dadeba36c305
Bug: 315507370
Change-Id: I736ed6ba143e55fbde9f763792bf98eea3150387
2023-12-08 13:13:09 -08:00
Xin Li
28f437ba44
[automerger skipped] Merge UQ1A.231205.015 am: e22d1ba5b6
-s ours am: fa0fb98c2f
-s ours
...
am skip reason: Merged-In I403e87cf5943f5c45d6d0db99a3e15018064067a with SHA-1 8f9b6dbaaa
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/25591208
Change-Id: Iee1f53eb474dc5b79c358c3972fc5e00c744baa3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08 08:51:07 +00:00
Xin Li
fa0fb98c2f
[automerger skipped] Merge UQ1A.231205.015 am: e22d1ba5b6
-s ours
...
am skip reason: Merged-In I403e87cf5943f5c45d6d0db99a3e15018064067a with SHA-1 8f9b6dbaaa
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/25591208
Change-Id: I53b028adafb054f2ad28c0c055e31ef88dd4aecd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08 08:21:19 +00:00
Xin Li
e22d1ba5b6
Merge UQ1A.231205.015
...
Bug: 308969284
Merged-In: I403e87cf5943f5c45d6d0db99a3e15018064067a
Change-Id: Ib8c40e3ac85fb722adbe2ee4b7a2dadeba36c305
2023-12-07 15:51:03 -08:00
Treehugger Robot
4895b40a23
Merge changes from topic "p21-gamemodetuning" into main
...
* changes:
powerhint: game mode tuning
powerhint: add game mode tuning nodes
2023-12-07 18:51:11 +00:00
Roshan Pius
8f013ac1a6
Revert^2 "bluejay(nfc): Modify NFC overlays for NFC apex"
...
041ffd8ea6
Bug: 303286040
Test: Compiles
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:13426a9d37641687908d97c969a2c547eb5f19cd )
Merged-In: I443bcf2681437ec4a0caa3fdb5046ab856db0ddb
Change-Id: I443bcf2681437ec4a0caa3fdb5046ab856db0ddb
Change-Id: Ic52d8977c950aec66a6206736fa0ded4adacb1c2
2023-12-07 10:26:16 -08:00
Roshan Pius
f9d6933a7c
Revert^2 "bluejay: Replace NFC app with NFC apex"
...
75bff8a95f
Bug: 303286040
Test: Compiles
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:35de536662907b57cb115afb3446096fb15e0d8b )
Merged-In: Ibc741f24cc6d19adda3097d17bc81baf455f71d3
Change-Id: Ibc741f24cc6d19adda3097d17bc81baf455f71d3
2023-12-06 21:30:51 +00:00
Roshan Pius
13426a9d37
Revert^2 "bluejay(nfc): Modify NFC overlays for NFC apex"
...
041ffd8ea6
Bug: 303286040
Test: Compiles
Change-Id: I443bcf2681437ec4a0caa3fdb5046ab856db0ddb
2023-12-04 13:48:34 -08:00
Roshan Pius
35de536662
Revert^2 "bluejay: Replace NFC app with NFC apex"
...
75bff8a95f
Bug: 303286040
Test: Compiles
Change-Id: Ibc741f24cc6d19adda3097d17bc81baf455f71d3
2023-12-04 11:52:21 -08:00