Commit graph

5680 commits

Author SHA1 Message Date
Ankur Bakshi
6a7ae4bd32 Update oriole SVN to 74 am: 7b6a615aa8
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/25291797

Change-Id: I16d3f7bb7e05b4f684d3df3c27192a3856ce8f13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16 04:29:00 +00:00
Roshan Pius
eb2833b193 [automerger skipped] Merge "Revert "raviole(nfc): Modify NFC overlays for NFC apex"" into main am: f3e7300c21 am: d75de74bcb -s ours
am skip reason: Merged-In I2716c95474b35fff59726c1cb9a54e5ea42f941e with SHA-1 d749a472a0 is already in history

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

Change-Id: If66c5d2b854174793c4bc9c3d82ef5e55086b376
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 22:48:54 +00:00
Roshan Pius
14a8ceaafb Revert "raven: Replace NFC app with NFC apex" am: 84b70f6ffc am: df8db2ed75
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2817934

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

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

Change-Id: Ic14c4d84b7743ee677041dc1b8861885feeac995
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 22:46:04 +00:00
Roshan Pius
d75de74bcb 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: I0e691831753f60bcd4afc2b1823f86304896f4ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 21:49:04 +00:00
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
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
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
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
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
1270c071a5 Update oriole SVN to 72 am: de8cd7d5e9 am: 218ff1cf06
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/25177134

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

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

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

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

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

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

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

Change-Id: Ic071408b81a4095fd3874a32dd9a79fe91ad1811
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
579c8fa110 Update raven SVN to 71 am: 91dbbaf6a2
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/25174557

Change-Id: I2d05bf9a04d47d9f289bb8102ac7926e324b9917
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 19:06:00 +00:00
Lokesh Kumar Goel
ccba4ef94a Update oriole SVN to 71 am: 024c12af32
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/25176367

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

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

Change-Id: I425997b8caf583412c3f2e1e7c6c83c1818ed981
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
42c68635d0 Update raven SVN to 71 am: 91dbbaf6a2
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/25174557

Change-Id: Ie090ea59db0dc6057975e53356ba81e3df2d1f4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 19:03:29 +00:00
Lokesh Kumar Goel
a56ff2d2d9 Update oriole SVN to 71 am: 024c12af32
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/25176367

Change-Id: I43ae3e745a82673ede92003273302ae748fa7736
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 19:03:26 +00:00
Roshan Pius
552a0fd957 raviole(nfc): Modify NFC overlays for NFC apex am: 8c24309054 am: 29e36a79a1
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2803464

Change-Id: I395e48a2261f0210c20df750cee699484082ed9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 14:58:36 +00:00
Roshan Pius
2651fef279 raviole(nfc): Modify NFC overlays for NFC apex am: 8c24309054 am: b970e2c215
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2803464

Change-Id: I5ae50be69ab00b0bd8b118fc1ce617fc07967504
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 14:57:10 +00:00
Roshan Pius
29e36a79a1 raviole(nfc): Modify NFC overlays for NFC apex am: 8c24309054
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2803464

Change-Id: Ib183cae865d2235c17e94dc350010cdb69239442
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 14:35:52 +00:00
Roshan Pius
b970e2c215 raviole(nfc): Modify NFC overlays for NFC apex am: 8c24309054
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2803464

Change-Id: I5aa933d342b7192888bcff09d03a0522fe524f61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 14:33:57 +00:00
Roshan Pius
8c24309054 raviole(nfc): Modify NFC overlays for NFC apex
Bug: 307763519
Test: Manual flash and tested the overlay values are taking effect.
Change-Id: I9a6de12915c42f22cca35543e665ff0a003938dd
2023-10-25 14:56:26 -07:00
Lokesh Kumar Goel
4380094579 Update oriole SVN to 72 am: e2f006d29c
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/24897202

Change-Id: Icb9a4ee8b040975099d2147c26356737c8095c16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-25 20:43:25 +00:00