Commit graph

6393 commits

Author SHA1 Message Date
Roshan Pius
df8db2ed75 Revert "raven: Replace NFC app with NFC apex" am: 84b70f6ffc
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2817934

Change-Id: I113794f6a77439d33351b8b9cb6657c74936c049
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 21:48:51 +00:00
Roshan Pius
78f9ccc598 Merge "Revert "raviole(nfc): Modify NFC overlays for NFC apex"" into main am: f3e7300c21
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2818129

Change-Id: Iee0190eb4b01faffeaa24fa2b96baf25733598c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 21:45:34 +00:00
Roshan Pius
3f84f73a17 Revert "raven: Replace NFC app with NFC apex" am: 84b70f6ffc
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2817934

Change-Id: I7ce886afff57cab8614f551d028f5fce84b9b68a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 21:45:24 +00:00
Roshan Pius
f3e7300c21 Merge "Revert "raviole(nfc): Modify NFC overlays for NFC apex"" into main 2023-11-08 21:16:19 +00:00
Roshan Pius
84b70f6ffc Revert "raven: Replace NFC app with NFC apex"
Revert submission 24993894-cherrypicker-L80100000963393177:N49200001411943056

Reason for revert: Causing bootloop with signed builds

Reverted changes: /q/submissionid:24993894-cherrypicker-L80100000963393177:N49200001411943056

Bug: 309117462
Test: Compiles, device boots up
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:c0c4781f17b3804c708ca3630d4c1161d5152b70)
Merged-In: I9298ad5be151b96e3b77301490feb8aaee3231b1
Change-Id: I9298ad5be151b96e3b77301490feb8aaee3231b1
2023-11-07 04:06:12 +00:00
Ankur Bakshi
7b6a615aa8 Update oriole SVN to 74
Bug: 309529736
Change-Id: I46458735aaba542defde0ab3319d1afd61f051f4
2023-11-07 03:13:05 +00:00
Roshan Pius
d749a472a0 Revert "raviole(nfc): Modify NFC overlays for NFC apex"
Revert submission 2802548-nfc_apex

Reason for revert: Causing bootloop with signed builds

Reverted changes: /q/submissionid:2802548-nfc_apex

Bug: 309117462
Test: Compiles, device boots up
Merged-In: I2716c95474b35fff59726c1cb9a54e5ea42f941e
Change-Id: I2716c95474b35fff59726c1cb9a54e5ea42f941e
2023-11-06 19:46:05 +00:00
Roshan Pius
35ad1b0498 Revert "raviole(nfc): Modify NFC overlays for NFC apex"
Revert submission 2802548-nfc_apex

Reason for revert: Causing bootloop with signed builds

Reverted changes: /q/submissionid:2802548-nfc_apex

Bug: 309117462
Test: Compiles, device boots up
(cherry picked from https://android-review.googlesource.com/q/commit:ec76544b6397c1efdbcc28b6de021dd1f1d7ce78)
Merged-In: I2716c95474b35fff59726c1cb9a54e5ea42f941e
Change-Id: I2716c95474b35fff59726c1cb9a54e5ea42f941e
2023-11-06 14:30:47 +00:00
Roshan Pius
c0c4781f17 Revert "raven: Replace NFC app with NFC apex"
Revert submission 24993894-cherrypicker-L80100000963393177:N49200001411943056

Reason for revert: Causing bootloop with signed builds

Reverted changes: /q/submissionid:24993894-cherrypicker-L80100000963393177:N49200001411943056

Bug: 309117462
Change-Id: I9298ad5be151b96e3b77301490feb8aaee3231b1
Test: Compiles, device boots up
2023-11-06 14:30:47 +00:00
Greg Kaiser
7081f75f52 [automerger skipped] Fix lunch choices for git_main am: 99f12f480a am: ffb744af7f -s ours am: 9a284bdde5 -s ours
am skip reason: Merged-In I9778ab070155d18d4c67f31c9ff39863e7ba34af with SHA-1 99f12f480a is already in history

Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2811124

Change-Id: Idf4d2717291dbce663277105be6f95d047c1dfa4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-31 00:14:57 +00:00
Greg Kaiser
0e471134e4 [automerger skipped] Fix lunch choices for git_main am: 99f12f480a am: 908902cac8 am: fac6785cab -s ours
am skip reason: Merged-In I9778ab070155d18d4c67f31c9ff39863e7ba34af with SHA-1 08176b5882 is already in history

Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2811124

Change-Id: Ibedfe927bba09987d4d9bcdad25c1431d18615e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-31 00:12:52 +00:00
Greg Kaiser
9a284bdde5 [automerger skipped] Fix lunch choices for git_main am: 99f12f480a am: ffb744af7f -s ours
am skip reason: Merged-In I9778ab070155d18d4c67f31c9ff39863e7ba34af with SHA-1 99f12f480a is already in history

Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2811124

Change-Id: I7f7899778a65bea897833c90d43327a358929ef7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-30 23:38:06 +00:00
Greg Kaiser
fac6785cab Fix lunch choices for git_main am: 99f12f480a am: 908902cac8
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2811124

Change-Id: Ia60e574223a13ca19cf966a7db6f5702f72fbabb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-30 23:34:55 +00:00
Greg Kaiser
ffb744af7f Fix lunch choices for git_main am: 99f12f480a
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2811124

Change-Id: Icc9366529a269a065d3f2722808690eb7a664d59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-30 23:11:14 +00:00
Greg Kaiser
908902cac8 Fix lunch choices for git_main am: 99f12f480a
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2811124

Change-Id: Iac3f389166deaa63f5772029992b66a7ee3d210e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-30 23:09:02 +00:00
Greg Kaiser
99f12f480a 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
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:08176b5882ebf16aed25d650aa474b3dc3d05c96)
Merged-In: I9778ab070155d18d4c67f31c9ff39863e7ba34af
Change-Id: I9778ab070155d18d4c67f31c9ff39863e7ba34af
2023-10-30 22:00:57 +00:00
Will Song
423f99e59b PREUPLOAD: Enforce jsonlint in preupload
Checks syntax and simple brace balances for all JSON files.

Test: Edit any json file and try upload
Bug: 127794899
Change-Id: Iae810239db56de48c73a4ff3f5fcebc7f805203b
2023-10-29 02:11:45 +00:00
Android Build Coastguard Worker
f8a95c27da Merge cherrypicks of ['googleplex-android-review.googlesource.com/25177133', 'googleplex-android-review.googlesource.com/25177134', 'googleplex-android-review.googlesource.com/25064388', 'googleplex-android-review.googlesource.com/25169438', 'googleplex-android-review.googlesource.com/25180080'] into udc-qpr1-release.
Change-Id: Id38f208e19713c347fdd76b0f5fe49855995b0b5
2023-10-27 03:36:15 +00:00
Ankur Bakshi
1e51c14cff Update oriole SVN to 73
Bug: 302612466
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:0240e9137174abd21bcec6332f6a3e959437ac23)
Merged-In: Ib2893f0b721498f7c2b71377e79123765afd164f
Change-Id: Ib2893f0b721498f7c2b71377e79123765afd164f
2023-10-27 03:33:46 +00:00
Ankur Bakshi
d9627e21f1 Update raven SVN to 73
Bug: 302612466
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:6715a1002e4b73f62a1e233234a857e4ea5dcf61)
Merged-In: Ie036112a3c0890629e5169991dc76c0407705b39
Change-Id: Ie036112a3c0890629e5169991dc76c0407705b39
2023-10-27 03:33:38 +00:00
Shivakumar Neginal
68b4cb6227 Adding Fast Pair extended IDs for Pixel 6
Adding the Fast Pair extended IDs for oriole and raven so that
Quick Start shows the right Fast Pair bottom sheet on other devices
during setup.

Bug: 305516133
Test: Manually flashed a oriole & raven device and validated the FP
      bottom sheet is displayed on a nearby other device
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:4fb3e74540a7be3badfc73f553cfb4b5d960dc5c)
Merged-In: Iba09888de27f92e16ab0979a7d62e9a7c6505ff2
Change-Id: Iba09888de27f92e16ab0979a7d62e9a7c6505ff2
2023-10-27 03:33:31 +00:00
Lokesh Kumar Goel
f055b6ff8f Update oriole SVN to 72
Bug: 302612466
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:de8cd7d5e9611936c024988558237a12b4fda36f)
Merged-In: I8dd3b2389683050f017bbc09946bce8a14e979e8
Change-Id: I8dd3b2389683050f017bbc09946bce8a14e979e8
2023-10-27 03:33:23 +00:00
Lokesh Kumar Goel
4f5896c20a Update raven SVN to 72
Bug: 302612466
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:c56cc1ffe2b692a70f0a9d4037f00543794c3817)
Merged-In: I0d77e8c5e8878196f73fc0cb86406e0ff2bceecc
Change-Id: I0d77e8c5e8878196f73fc0cb86406e0ff2bceecc
2023-10-27 03:33:15 +00:00
Cyan_Hsieh
9926df8f8a Split bootloader prebuilt to 24Q1 and trunk version
Bug: 299879102
Change-Id: I048cfeecf8fcc06dab362819a5548db4c34d417e
2023-10-27 03:04:54 +00:00
Ankur Bakshi
62449a1c84 Update oriole SVN to 73 am: 0240e91371 am: 56ed3151f1
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/25180080

Change-Id: Ied8e10140f732f8ac742b84b8a7f1e8b5714c905
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-27 02:50:19 +00:00
Ankur Bakshi
90fcf83ff2 Update raven SVN to 73 am: 6715a1002e am: ec3bbd78af
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/25169438

Change-Id: I122af9995cbc469ab3c49fcbcfdcf05786855f9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-27 02:48:55 +00:00
Ankur Bakshi
56ed3151f1 Update oriole SVN to 73 am: 0240e91371
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/25180080

Change-Id: I224ea46efa913ac251e2433efcf069f67936ff80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-27 02:19:29 +00:00
Ankur Bakshi
ec3bbd78af Update raven SVN to 73 am: 6715a1002e
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/25169438

Change-Id: Id7a88c150ce603f2000f289011c0c6c596cefd99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-27 02:19:14 +00:00
Ankur Bakshi
0240e91371 Update oriole SVN to 73
Bug: 302612466
Change-Id: Ib2893f0b721498f7c2b71377e79123765afd164f
2023-10-27 01:46:43 +00:00
Ankur Bakshi
6715a1002e Update raven SVN to 73
Bug: 302612466
Change-Id: Ie036112a3c0890629e5169991dc76c0407705b39
2023-10-27 01:42:43 +00:00
Shivakumar Neginal
49561768ed Adding Fast Pair extended IDs for Pixel 6 am: 4fb3e74540 am: e6173eefc5
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/25064388

Change-Id: Id452be286c08232134578d289021fd1a03f4ebf3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 23:54:02 +00:00
Shivakumar Neginal
e6173eefc5 Adding Fast Pair extended IDs for Pixel 6 am: 4fb3e74540
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/25064388

Change-Id: I1f86f7167c1b14a7466a08e79e83586057d64acf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 23:23:35 +00:00
Shivakumar Neginal
4fb3e74540 Adding Fast Pair extended IDs for Pixel 6
Adding the Fast Pair extended IDs for oriole and raven so that
Quick Start shows the right Fast Pair bottom sheet on other devices
during setup.

Bug: 305516133
Test: Manually flashed a oriole & raven device and validated the FP
      bottom sheet is displayed on a nearby other device
Change-Id: Iba09888de27f92e16ab0979a7d62e9a7c6505ff2
2023-10-26 22:55:38 +00:00
Lokesh Kumar Goel
57a7872a13 Update oriole SVN to 72 am: de8cd7d5e9 am: 218ff1cf06 am: 1270c071a5 am: 80fe3363f8
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/25177134

Change-Id: Ifab8e0c82dc39d4b9ccf5294d7150ceb356a0c58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 22:22:37 +00:00
Lokesh Kumar Goel
72ff0212bc Update raven SVN to 72 am: c56cc1ffe2 am: fe2ccb4d85 am: 25e1ad2aa2 am: 142961b793
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/25177133

Change-Id: I12fc1a85dedbf5861fe59305f5773e3f89801257
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
aa06069a13 [automerger skipped] Update raven SVN to 71 am: 91dbbaf6a2 am: 579c8fa110 -s ours am: c173484249 -s ours am: 0050f6515f -s ours
am skip reason: skipped by user lokeshgoel

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

Change-Id: Iad2b9dc21b46ecb1ec490ad8416958ef74b62e96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 22:21:59 +00:00
Lokesh Kumar Goel
8853324e8c [automerger skipped] Update oriole SVN to 71 am: 024c12af32 am: ccba4ef94a -s ours am: 96af1a44dc -s ours am: 9ffb396780 -s ours
am skip reason: skipped by user lokeshgoel

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

Change-Id: I5a7d986ebaa0dbe02f51d2c7fbdcdaf148529034
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 22:21:51 +00:00
Lokesh Kumar Goel
2e09c14bd8 Update oriole SVN to 72 am: de8cd7d5e9 am: bab1d110df am: e14d335eaa
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/25177134

Change-Id: I157e606d8ce945751d3735bde9c4011bba1a99b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 22:19:49 +00:00
Lokesh Kumar Goel
123a6f4d44 Update raven SVN to 72 am: c56cc1ffe2 am: c42d9e1215 am: a5bc69c6e8
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/25177133

Change-Id: I66c13adb33eef36a871066c0dbc23a84a0aa0066
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
fb6b25645e [automerger skipped] Update raven SVN to 71 am: 91dbbaf6a2 am: 42c68635d0 -s ours am: cfaa883a5a -s ours
am skip reason: skipped by user lokeshgoel

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

Change-Id: If63a435ed48636b6810926a4166eb1c5f55a8a60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 21:56:44 +00:00
Lokesh Kumar Goel
190964f5aa [automerger skipped] Update oriole SVN to 71 am: 024c12af32 am: a56ff2d2d9 -s ours am: c51d56579e -s ours
am skip reason: skipped by user lokeshgoel

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

Change-Id: I8405ca677139d8377c436fdaed4f10071310eb3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 21:56:37 +00:00
Lokesh Kumar Goel
80fe3363f8 Update oriole SVN to 72 am: de8cd7d5e9 am: 218ff1cf06 am: 1270c071a5
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/25177134

Change-Id: I75278de32d6d100081f1bd14b39ad4cb92e36aa4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 21:55:37 +00:00
Lokesh Kumar Goel
142961b793 Update raven SVN to 72 am: c56cc1ffe2 am: fe2ccb4d85 am: 25e1ad2aa2
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/25177133

Change-Id: I00d534f2357f3dc43a35f68a1b7ebb371c376a6b
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
0050f6515f [automerger skipped] Update raven SVN to 71 am: 91dbbaf6a2 am: 579c8fa110 -s ours am: c173484249 -s ours
am skip reason: skipped by user lokeshgoel

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

Change-Id: I6fc3e35e78b02176355a62d48fe3b14bb436e57d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 21:55:06 +00:00
Lokesh Kumar Goel
9ffb396780 [automerger skipped] Update oriole SVN to 71 am: 024c12af32 am: ccba4ef94a -s ours am: 96af1a44dc -s ours
am skip reason: skipped by user lokeshgoel

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

Change-Id: Ic6447cc4f258f550b22faeec07ac22778640dc58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 21:54:57 +00:00
Lokesh Kumar Goel
e14d335eaa Update oriole SVN to 72 am: de8cd7d5e9 am: bab1d110df
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/25177134

Change-Id: I5ca2927ecb1ee1ef646a3eb144e7708a80b8339f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 21:33:22 +00:00
Lokesh Kumar Goel
a5bc69c6e8 Update raven SVN to 72 am: c56cc1ffe2 am: c42d9e1215
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/25177133

Change-Id: Ib7100103d71f347bd28eb6ac589ef8880349f9b5
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
cfaa883a5a [automerger skipped] Update raven SVN to 71 am: 91dbbaf6a2 am: 42c68635d0 -s ours
am skip reason: skipped by user lokeshgoel

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

Change-Id: Icb741e5f285a52b5032bd15fc9286a21fab52f3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 21:32:44 +00:00
Lokesh Kumar Goel
c51d56579e [automerger skipped] Update oriole SVN to 71 am: 024c12af32 am: a56ff2d2d9 -s ours
am skip reason: skipped by user lokeshgoel

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

Change-Id: Id218d10b5fd4a0738c02356224d8c21173d7416d
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
3bafa939b8 Update oriole SVN to 72 am: de8cd7d5e9 am: 0d1608d158
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/25177134

Change-Id: Iaec85413f8e50df15ff9ef0ada42ac68e5d67fae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 21:30:00 +00:00