Commit graph

2685 commits

Author SHA1 Message Date
Android Build Coastguard Worker
dbaae78c06 Snap for 11469542 from 923d36430f to 24Q3-release
Change-Id: I96c6bb7aed5baba95810699c288d95d42db5648d
2024-02-20 00:01:59 +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
8a32b57441 Merge "Snap for 11455877 from 0f42293165 to 24Q3-release" into 24Q3-release 2024-02-16 01:30:22 +00:00
Android Build Coastguard Worker
507a76f9a8 Snap for 11455877 from 0f42293165 to 24Q3-release
Change-Id: Ia063cf6cf3cbc902080ada512a59463e714ee0b5
2024-02-16 00:22:41 +00:00
Android Build Coastguard Worker
8806d27124 Snap for 11455651 from 0f42293165 to 24Q3-release
Change-Id: I53885ec3d87a18aa079c1fd6684a26bca7ff2e2f
2024-02-16 00:13:34 +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
Ankur Bakshi
2cc93e92b3 Update bluejay SVN to 55
Bug: 313797924
Change-Id: Ie828075b65f51b1bb8109c0a330542b0f620b7ca
2023-11-29 23:39:56 +00:00
Ankur Bakshi
0993543fec Update bluejay SVN to 54 am: 97ca2e0e16 am: 11681ac049
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/25498857

Change-Id: I699e3d42976347241e9605ace826fa80c3b505de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 23:05:23 +00:00
Ankur Bakshi
11681ac049 Update bluejay SVN to 54 am: 97ca2e0e16
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/25498857

Change-Id: Iae6988b087452e056db920b146c7b4aa37b7eaf9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 22:35:00 +00:00
Ankur Bakshi
97ca2e0e16 Update bluejay SVN to 54
Bug: 313696499
Change-Id: Iadb6f6d58659b63bb1d3d1fad6c6c839f899814c
2023-11-29 06:19:57 +00:00
Treehugger Robot
4f49b25fdc Merge "[conflict] Remove unused Android.mk under device/google/bluejay am: 34aaf50436 am: 97d8fa99d2" into udc-qpr-dev-plus-aosp am: 2d4767736f
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/25422286

Change-Id: I90daa087ffa06c6b99e6fd5f95574f51954a5fe4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-21 04:04:38 +00:00
Treehugger Robot
2d4767736f Merge "[conflict] Remove unused Android.mk under device/google/bluejay am: 34aaf50436 am: 97d8fa99d2" into udc-qpr-dev-plus-aosp 2023-11-21 03:25:34 +00:00
Herbert Xue
930cfe784b [conflict] Remove unused Android.mk under device/google/bluejay am: 34aaf50436 am: 3a915de31c am: 2ddcebecac
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/25420741

Change-Id: If2b52762be3294ba73e5014bb77156e2f2913752
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-21 03:14:57 +00:00