Commit graph

2717 commits

Author SHA1 Message Date
Lokesh Kumar Goel
fa31f7845b Update bluejay SVN to 51 am: d81b0b63f1
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/25177019

Change-Id: If96827bca3f8263d389c3cc02460285724ca7ac6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 19:04:38 +00:00
Lokesh Kumar Goel
d37a3ad681 Update bluejay SVN to 50 am: d92f98af41
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/25175978

Change-Id: I02f1f2560c8b00d77cee9ecc632bb3d35b9d815d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 19:04:07 +00:00
Lokesh Kumar Goel
324dad2794 Update bluejay SVN to 51 am: d81b0b63f1
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/25177019

Change-Id: I945bb62caacc7c0e039a1cb3ab703146c30537ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 19:03:52 +00:00
Lokesh Kumar Goel
7f7d1b1bc2 Update bluejay SVN to 50 am: d92f98af41
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/25175978

Change-Id: I727199b7b6db757aab8dfceabd10efea737971ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 19:03:26 +00:00
Roshan Pius
b640546405 bluejay(nfc): Modify NFC overlays for NFC apex am: 37718485f2 am: 8594b545a4 am: 4a406ef346
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2804473

Change-Id: Ia1cfa6de4e81c9e76020ba91be4ae62e67a53550
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 15:30:22 +00:00
Roshan Pius
54fa349a66 bluejay(nfc): Modify NFC overlays for NFC apex am: 37718485f2 am: bb6c74b55e am: f77dc2de58
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2804473

Change-Id: I94aa983f3b6c9b4deabcad96c6d514789f5598cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 15:29:07 +00:00
Roshan Pius
4a406ef346 bluejay(nfc): Modify NFC overlays for NFC apex am: 37718485f2 am: 8594b545a4
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2804473

Change-Id: I2bcb514875e5d3c550b79c80c4161aee75e9bae0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 14:58:36 +00:00
Roshan Pius
f77dc2de58 bluejay(nfc): Modify NFC overlays for NFC apex am: 37718485f2 am: bb6c74b55e
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2804473

Change-Id: I85b56ea22c5e247f40d47d7b7e210411b118cda4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 14:57:10 +00:00
Roshan Pius
8594b545a4 bluejay(nfc): Modify NFC overlays for NFC apex am: 37718485f2
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2804473

Change-Id: Id1220d4fcd9dbfd9797e6ffcd7e1687cc0259366
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 14:35:53 +00:00
Roshan Pius
bb6c74b55e bluejay(nfc): Modify NFC overlays for NFC apex am: 37718485f2
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2804473

Change-Id: Ie270077019a977d62b50c2cd855eecefc2b18901
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 14:33:57 +00:00
Cyan_Hsieh
c3b88049bd Split bootloader prebuilt to 24Q1 and trunk version
Bug: 299879102
Change-Id: I4ff8225a008947d82b0a5517ea156bea36215f00
2023-10-26 14:04:21 +08:00
Ankur Bakshi
8f9b6dbaaa Update bluejay SVN to 52
Bug: 302612466
Change-Id: I403e87cf5943f5c45d6d0db99a3e15018064067a
2023-10-26 05:11:06 +00:00
Treehugger Robot
28a3b7b44d Merge "Fix lunch choices for git_main" into main 2023-10-25 23:42:17 +00:00
Greg Kaiser
c0159563f3 Fix lunch choices for git_main
We add "trunk_staging-" for all COMMON_LUNCH_CHOICES so they are
valid in the trunk stable setup.

Bug: 307738446
Test: lunch
Change-Id: I47590aaf84bd2481d53c04889c2963e02b7a816d
2023-10-25 15:37:23 -06:00
Lokesh Kumar Goel
e15a8f14e6 Update bluejay SVN to 51 am: be1d0f6c38 am: abc5777051
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24895584

Change-Id: I5b5596a2b424a83805201d0099e7aa8b9a24cdc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-25 21:09:44 +00:00
Roshan Pius
37718485f2 bluejay(nfc): Modify NFC overlays for NFC apex
Bug: 307763519
Test: Manual flash and tested the overlay values are taking effect.
Change-Id: Ia8787c18a6eb3ff932a783cfcde6380f9937cd59
2023-10-25 14:06:47 -07:00
Lokesh Kumar Goel
abc5777051 Update bluejay SVN to 51 am: be1d0f6c38
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24895584

Change-Id: I426896ab3c85723d1cced3958c7f5b7b78845e8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-25 20:43:00 +00:00
Lokesh Kumar Goel
d81b0b63f1 Update bluejay SVN to 51
Bug: 302612466
Change-Id: If8f16626a5e13f98e81ff0833a60888efe9cddcd
2023-10-25 20:23:42 +00:00
Lokesh Kumar Goel
d92f98af41 Update bluejay SVN to 50
Bug: 302612466
Change-Id: I7393253ef50c9b1da0f683ffcdd9cd191c8ab1f6
2023-10-25 19:47:19 +00:00
TeYuan Wang
bfec851399 thermal: align the setting VSKIN related sensors
Bug: 302435949
Test: emul_temp
Change-Id: Ib8ca404fe575ade08146e612354f8f06734eab72
2023-10-20 13:50:17 -07:00
Xin Li
551ae6bc31 [automerger skipped] Merge 10952656 am: 24cba1b02d -s ours am: 27cc067aac -s ours
am skip reason: Merged-In I21193dd2a51d86c0c5ed04d48c188f906557be7c with SHA-1 2c840cedbf is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/25089492

Change-Id: I06ab1ba2168927a45f47150dc0991739b9b5690f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19 23:54:46 +00:00
Xin Li
27cc067aac [automerger skipped] Merge 10952656 am: 24cba1b02d -s ours
am skip reason: Merged-In I21193dd2a51d86c0c5ed04d48c188f906557be7c with SHA-1 2c840cedbf is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/25089492

Change-Id: Ib20640381054bba1fb00c6c5484b12fc5b5f7652
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19 18:48:01 +00:00
Xin Li
24cba1b02d Merge 10952656
Merged-In: I21193dd2a51d86c0c5ed04d48c188f906557be7c
Change-Id: Iffafbf45335d4af3635be599badc69f765b1320d
2023-10-17 10:05:54 -07:00
Android Build Coastguard Worker
24e2cccebc Merge cherrypicks of ['googleplex-android-review.googlesource.com/24895526'] into udc-qpr1-release.
Change-Id: Ica994201185611747baafb97a0da165c5fa5960c
2023-10-17 02:45:25 +00:00
Lokesh Kumar Goel
fa7a219cb4 Update bluejay SVN to 50
Bug: 302612466
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:9b309d763af958632045184fe493b6ed1d1510c2)
Merged-In: I7393253ef50c9b1da0f683ffcdd9cd191c8ab1f6
Change-Id: I7393253ef50c9b1da0f683ffcdd9cd191c8ab1f6
2023-10-17 02:40:49 +00:00
Roshan Pius
59bad4f222 [automerger skipped] Merge "bluejay: Replace NFC app with NFC apex" into main am: 1c66031b9e am: 35abd35c39 am: b1644a944c am: 82bdbb3751 am: 76a30c7050 -s ours
am skip reason: Merged-In Ief6317a97f4c0208e506afc17ed6ab37e81d2db1 with SHA-1 168fe64455 is already in history

Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2779508

Change-Id: I101c2c8cdc2f75043d3c7915681a63d0cea5942b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-16 20:57:56 +00:00
Roshan Pius
76a30c7050 Merge "bluejay: Replace NFC app with NFC apex" into main am: 1c66031b9e am: 35abd35c39 am: b1644a944c am: 82bdbb3751
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2779508

Change-Id: Id35526ef528b708275d89319520e43f6f2688f1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-16 20:49:15 +00:00
Shivakumar Neginal
648307e16f Adding Fast Pair extended IDs for Pixel 6a
Adding the Fast Pair extended IDs for bluejay so that
    Quick Start shows the right Fast Pair bottom sheet on other devices
    during setup.

    Bug: 305516133
    Test: TBD

Change-Id: I852842706664902dc3a76175810ebf869439796d
2023-10-16 20:22:17 +00:00
Roshan Pius
82bdbb3751 Merge "bluejay: Replace NFC app with NFC apex" into main am: 1c66031b9e am: 35abd35c39 am: b1644a944c
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2779508

Change-Id: I66fe9f2e337614fc296d4c1b02c490e43a3f78ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-16 20:13:12 +00:00
Roshan Pius
b1644a944c Merge "bluejay: Replace NFC app with NFC apex" into main am: 1c66031b9e am: 35abd35c39
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2779508

Change-Id: I3fcabe68c78d3b00a3baf38c2c9e1b1ecfb807dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-16 19:38:21 +00:00
Roshan Pius
35abd35c39 Merge "bluejay: Replace NFC app with NFC apex" into main am: 1c66031b9e
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2779508

Change-Id: I5f99bd729fd6f34e867076d9be9e660b12f10809
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-16 19:15:57 +00:00
Roshan Pius
1c66031b9e Merge "bluejay: Replace NFC app with NFC apex" into main 2023-10-16 18:31:03 +00:00
Lokesh Kumar Goel
3c9c537363 Update bluejay SVN to 50 am: 9b309d763a am: 10346ce553
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24895526

Change-Id: I38be00002a317c2631383ff4cf69248798ba22f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-16 05:35:26 +00:00
Lokesh Kumar Goel
10346ce553 Update bluejay SVN to 50 am: 9b309d763a
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24895526

Change-Id: Id4737296e1311fac016e08350c1ca0201ee8c891
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-16 05:04:26 +00:00
Roshan Pius
f67025292b bluejay: Replace NFC app with NFC apex
Bug: 303286040
Test: Compiles
Merged-In: Ief6317a97f4c0208e506afc17ed6ab37e81d2db1
Change-Id: Ief6317a97f4c0208e506afc17ed6ab37e81d2db1
2023-10-13 18:03:57 +00:00
Guibing Cai
67a3395370 Merge "powerhint: bluejay: update vendor_sched procfs paths" into main 2023-10-13 17:19:11 +00:00
guibing
5f5a34609b powerhint: bluejay: update vendor_sched procfs paths
Vendor sched procfs path hierarchy gets updated in kernel.
Update the paths in powerhint json file to match the change.

Bug: 289151587
Test: Uibench ab test
Change-Id: I08b099b8267a8744ec50175d3284fb48a404c285
2023-10-11 23:57:35 +00:00
Roshan Pius
168fe64455 bluejay: Replace NFC app with NFC apex
Bug: 303286040
Test: Compiles
(cherry picked from https://android-review.googlesource.com/q/commit:f09150e453cbc609d1d45a72fabb3eb8bff6bba1)
Merged-In: Ief6317a97f4c0208e506afc17ed6ab37e81d2db1
Change-Id: Ief6317a97f4c0208e506afc17ed6ab37e81d2db1
2023-10-09 19:56:02 +00:00
Xin Li
70cccd6310 [automerger skipped] Merge Android 14 am: 27a7db0162 -s ours am: b99740f973 -s ours am: 53d5d3e010 -s ours am: 5144fcfb74 -s ours am: 2c840cedbf -s ours
am skip reason: Merged-In Iecbf06a898f2c57da1ec29f6e5eb35241a3ec4f3 with SHA-1 0ea630f587 is already in history

Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2775835

Change-Id: I55b7b127458cd9be84243c05c6e92c2b0cc0bef9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-07 00:19:52 +00:00
Xin Li
2c840cedbf [automerger skipped] Merge Android 14 am: 27a7db0162 -s ours am: b99740f973 -s ours am: 53d5d3e010 -s ours am: 5144fcfb74 -s ours
am skip reason: Merged-In Iecbf06a898f2c57da1ec29f6e5eb35241a3ec4f3 with SHA-1 0ea630f587 is already in history

Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2775835

Change-Id: I21193dd2a51d86c0c5ed04d48c188f906557be7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 11:00:21 +00:00
Xin Li
5144fcfb74 [automerger skipped] Merge Android 14 am: 27a7db0162 -s ours am: b99740f973 -s ours am: 53d5d3e010 -s ours
am skip reason: Merged-In Iecbf06a898f2c57da1ec29f6e5eb35241a3ec4f3 with SHA-1 0ea630f587 is already in history

Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2775835

Change-Id: I4d0f567451d80160a5db8595f2e9151393bfdda9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 09:50:31 +00:00
Xin Li
53d5d3e010 [automerger skipped] Merge Android 14 am: 27a7db0162 -s ours am: b99740f973 -s ours
am skip reason: Merged-In Iecbf06a898f2c57da1ec29f6e5eb35241a3ec4f3 with SHA-1 0ea630f587 is already in history

Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2775835

Change-Id: Iaf4888b74fd9817762fe4cf0d3b3d372c8affd9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 08:58:56 +00:00
Xin Li
b99740f973 [automerger skipped] Merge Android 14 am: 27a7db0162 -s ours
am skip reason: Merged-In Iecbf06a898f2c57da1ec29f6e5eb35241a3ec4f3 with SHA-1 0ea630f587 is already in history

Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2775835

Change-Id: I7882c11a29328f5077626b90364f28562b969df2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 07:51:50 +00:00
Xin Li
27a7db0162 Merge Android 14
Bug: 298295554
Merged-In: Iecbf06a898f2c57da1ec29f6e5eb35241a3ec4f3
Change-Id: I9a5965085ad017c52637497f38e34100e039c8cd
2023-10-05 15:32:08 -07:00
ClintChen
fbf46c398a b3: Enable build flag versioning for radio and bootloader
Bug: 301142125
Change-Id: I665ab708541ca3b6d027daa3cf66ed66d211242b
2023-10-04 09:26:52 +00:00
Jimmy Shiu
722fc7d417 Merge "powerhint: Add DISPLAY_CHANGE hint" into main 2023-10-03 14:57:44 +00:00
Xin Li
3037971877 [automerger skipped] Merge UP1A.231005.007 am: 856bb61b7d -s ours am: a3e430e4e4 -s ours am: 02f8503d75 -s ours am: d37e5b4997 -s ours
am skip reason: Merged-In Iecbf06a898f2c57da1ec29f6e5eb35241a3ec4f3 with SHA-1 d0c9858ecd is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24879335

Change-Id: Ia6db7b2539aeb8118fc482334867499f23202e0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-29 10:20:35 +00:00
Xin Li
d37e5b4997 [automerger skipped] Merge UP1A.231005.007 am: 856bb61b7d -s ours am: a3e430e4e4 -s ours am: 02f8503d75 -s ours
am skip reason: Merged-In Iecbf06a898f2c57da1ec29f6e5eb35241a3ec4f3 with SHA-1 d0c9858ecd is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24879335

Change-Id: I8c9d882b30602d25257dbc775dcc7dd80d86ac86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-29 09:04:35 +00:00
Xin Li
02f8503d75 [automerger skipped] Merge UP1A.231005.007 am: 856bb61b7d -s ours am: a3e430e4e4 -s ours
am skip reason: Merged-In Iecbf06a898f2c57da1ec29f6e5eb35241a3ec4f3 with SHA-1 d0c9858ecd is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24879335

Change-Id: I8fb5873e56341a2de110c601454e3377a9b0852d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-29 08:16:32 +00:00
Xin Li
a3e430e4e4 [automerger skipped] Merge UP1A.231005.007 am: 856bb61b7d -s ours
am skip reason: Merged-In Iecbf06a898f2c57da1ec29f6e5eb35241a3ec4f3 with SHA-1 d0c9858ecd is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24879335

Change-Id: I0ef2a99b0d9876400a0c992206a19f54ce99a738
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-29 07:15:42 +00:00