Commit graph

2961 commits

Author SHA1 Message Date
Treehugger Robot
0435ed76ad Merge " Adding Fast Pair extended IDs for Pixel 6a" into udc-qpr-dev am: 8a9f1ae07a
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/25069787

Change-Id: I20be0837399458d0c7c08270e5963f0215c81e77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 23:21:25 +00:00
Treehugger Robot
8a9f1ae07a Merge " Adding Fast Pair extended IDs for Pixel 6a" into udc-qpr-dev 2023-10-26 22:55:38 +00:00
Lokesh Kumar Goel
c75b1b2e69 Update bluejay SVN to 51 am: d81b0b63f1 am: 4a915db3d6 am: fa413e9e5a am: ee9f7982a8
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/25177019

Change-Id: Ib00a8acb6b308609c0e9ac405e7b60b234edc99b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 22:22:30 +00:00
Lokesh Kumar Goel
0de50b5230 [automerger skipped] Update bluejay SVN to 50 am: d92f98af41 am: 99b6c8f2d0 -s ours am: aa63eb3e2e -s ours am: 7a87d5e4f9 -s ours
am skip reason: skipped by user lokeshgoel

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

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

Change-Id: I08f86401fecdf1746ecd859e8bd6158788f852e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 22:19:41 +00:00
Lokesh Kumar Goel
85549b7e0f [automerger skipped] Update bluejay SVN to 50 am: d92f98af41 am: 7f7d1b1bc2 -s ours am: 66e4f34a48 -s ours
am skip reason: skipped by user lokeshgoel

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

Change-Id: Ibff87a2ac74306349876351712d7fe21df292647
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 21:56:38 +00:00
Lokesh Kumar Goel
ee9f7982a8 Update bluejay SVN to 51 am: d81b0b63f1 am: 4a915db3d6 am: fa413e9e5a
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/25177019

Change-Id: Iddd0eff9458b2236ccf4a13952fc4a1d91bf9c9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 21:55:29 +00:00
Lokesh Kumar Goel
7a87d5e4f9 [automerger skipped] Update bluejay SVN to 50 am: d92f98af41 am: 99b6c8f2d0 -s ours am: aa63eb3e2e -s ours
am skip reason: skipped by user lokeshgoel

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

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

Change-Id: I41fa243c7fd2491c6692a6e00e0dd17d9b977b2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 21:33:15 +00:00
Lokesh Kumar Goel
66e4f34a48 [automerger skipped] Update bluejay SVN to 50 am: d92f98af41 am: 7f7d1b1bc2 -s ours
am skip reason: skipped by user lokeshgoel

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

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

Change-Id: Id0e16c757751149204af074c20ad83850c9565c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 21:29:52 +00:00
Lokesh Kumar Goel
24180637ed [automerger skipped] Update bluejay SVN to 50 am: d92f98af41 am: d37a3ad681 -s ours
am skip reason: skipped by user lokeshgoel

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

Change-Id: Ie640f4e408b6f0b6c29e94ea3fda99a42bb2f29f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 21:28:59 +00:00
Lokesh Kumar Goel
fa413e9e5a Update bluejay SVN to 51 am: d81b0b63f1 am: 4a915db3d6
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/25177019

Change-Id: Ie6427c613eb503ac94a5e49b783864d7eaaabbf2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 21:24:39 +00:00
Lokesh Kumar Goel
aa63eb3e2e [automerger skipped] Update bluejay SVN to 50 am: d92f98af41 am: 99b6c8f2d0 -s ours
am skip reason: skipped by user lokeshgoel

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

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

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

Change-Id: I3d847205bf25f8b38fb86e0a269b7591185f2509
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 19:05:57 +00:00
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
9e92505a49 [automerger skipped] Merge 10952656 am: e109383517 -s ours am: 07db3ad0a2 -s ours
am skip reason: Merged-In I9356b4a7581fd56e0905e2e69f93bc41cb1ac3ca with SHA-1 b621985731 is already in history

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

Change-Id: I7c5ec2bede0c0da3e87db2f455dc305f7944db6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19 23:55:03 +00: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
07db3ad0a2 [automerger skipped] Merge 10952656 am: e109383517 -s ours
am skip reason: Merged-In I9356b4a7581fd56e0905e2e69f93bc41cb1ac3ca with SHA-1 b621985731 is already in history

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

Change-Id: If1e5f7becc138883e7870322fe21d5be2b37fad6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19 18:48:17 +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
e109383517 Merge 10952656
Merged-In: I9356b4a7581fd56e0905e2e69f93bc41cb1ac3ca
Change-Id: I08dbe6e19be27bc944766d6ac5c7bb3679215a22
2023-10-17 10:06:16 -07: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