Xin Li
abfb39adfd
[automerger skipped] Merge Android 14 QPR1 am: 5054f17083
-s ours am: c17d02f90d
-s ours
...
am skip reason: Merged-In I53da6a97159e21ad2bdda3f7bdcf390c66c58335 with SHA-1 b2ef9dc941
is already in history
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2866394
Change-Id: Ife1aaf112db9de18259e55dba018905337635fe0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 22:02:28 +00:00
Xin Li
c17d02f90d
[automerger skipped] Merge Android 14 QPR1 am: 5054f17083
-s ours
...
am skip reason: Merged-In I53da6a97159e21ad2bdda3f7bdcf390c66c58335 with SHA-1 b2ef9dc941
is already in history
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2866394
Change-Id: I1d17aefc9330c4490d79067c2ec703c319594635
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 21:16:39 +00:00
Xin Li
5054f17083
Merge Android 14 QPR1
...
Merged-In: I53da6a97159e21ad2bdda3f7bdcf390c66c58335
Bug: 315507370
Change-Id: Ib96ab1a79c7063a71754669c02bfd9acaa9b6911
2023-12-08 13:13:33 -08:00
Xin Li
f256b71d90
[automerger skipped] Merge UQ1A.231205.015 am: b2ef9dc941
-s ours
...
am skip reason: Merged-In Ib2893f0b721498f7c2b71377e79123765afd164f with SHA-1 0240e91371
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/25590964
Change-Id: Ib0c0aa49a5d1d1102f1ca83dde3d4d5cfdcfd173
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08 08:21:19 +00:00
Xin Li
b2ef9dc941
Merge UQ1A.231205.015
...
Bug: 308969284
Merged-In: Ib2893f0b721498f7c2b71377e79123765afd164f
Change-Id: I53da6a97159e21ad2bdda3f7bdcf390c66c58335
2023-12-07 15:47:37 -08:00
Vilas Bhat
e71def3ec9
16k: raviole: Update PRODUCT_PAGE_SIZE_AGNOSTIC to PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO am: 081b179003
am: a142c0e47b
...
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2858065
Change-Id: Ie7b04cb88ac215ca3e2ca5f88206cd63fdf20090
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06 14:41:36 +00:00
Vilas Bhat
66e43c7b35
16k: raviole: Update PRODUCT_PAGE_SIZE_AGNOSTIC to PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO am: 081b179003
am: c7adba5cc1
...
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2858065
Change-Id: Ib7735c0587400f667defcfa35bd6a83877781053
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06 14:39:56 +00:00
Vilas Bhat
c7adba5cc1
16k: raviole: Update PRODUCT_PAGE_SIZE_AGNOSTIC to PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO am: 081b179003
...
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2858065
Change-Id: I2f78c649ed7cb87b90bc9f6d9a30778eda9f5d7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06 14:09:16 +00:00
Vilas Bhat
a142c0e47b
16k: raviole: Update PRODUCT_PAGE_SIZE_AGNOSTIC to PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO am: 081b179003
...
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2858065
Change-Id: I563b75033946881ef22f292597a7565857c67232
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06 14:08:47 +00:00
Vilas Bhat
081b179003
16k: raviole: Update PRODUCT_PAGE_SIZE_AGNOSTIC to PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO
...
This is to help clarify that this flag doesn't mean the device
will actually work end-to-end with any page size.
Bug: 312541564
Change-Id: I9c68070d77d74cc9536961dd39dfbcce198975f1
2023-12-05 21:27:46 +00:00
Ankur Bakshi
eee9dcf524
Update oriole SVN to 75 am: b1bc52470f
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/25498988
Change-Id: Ibee7006ecb7bf55ac6c2a1aae11948328b7cff50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 22:35:08 +00:00
Ankur Bakshi
c77b8975e9
Update raven SVN to 75 am: 31d7180356
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/25498750
Change-Id: Ibf48f55e8c513f628562e30e25b9d4add17ca949
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 22:35:00 +00:00
Ankur Bakshi
b1bc52470f
Update oriole SVN to 75
...
Bug: 313696499
Change-Id: I64ab75fb46b604e34c25ef538872afec6bb39314
2023-11-29 22:08:33 +00:00
Ankur Bakshi
31d7180356
Update raven SVN to 75
...
Bug: 313696499
Change-Id: Ia73889924434581a2a8b1fccbc6df045bb90774f
2023-11-29 06:18:40 +00:00
Treehugger Robot
8ab204e5f3
Merge "Remove unused Android.mk under device/google/raviole am: bd9ce8035d
am: 4bc83922f9
" into udc-qpr-dev-plus-aosp
2023-11-21 03:25:30 +00:00
Herbert Xue
870b074231
Remove unused Android.mk under device/google/raviole am: bd9ce8035d
am: 88aa471023
...
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2836216
Change-Id: Id694e27a83411e3e66c13c0a6d1b27fd41814470
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-21 02:43:51 +00:00
Herbert Xue
98ca7b3b3f
Remove unused Android.mk under device/google/raviole am: bd9ce8035d
am: 4bc83922f9
...
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2836216
Change-Id: I0baa9c950dfa02ba7520edb633dec7ec082257cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-20 03:55:02 +00:00
Herbert Xue
88aa471023
Remove unused Android.mk under device/google/raviole am: bd9ce8035d
...
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2836216
Change-Id: If6a0c501f59dced35429f3d69547fdaf8e261126
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-20 03:24:05 +00:00
Herbert Xue
4bc83922f9
Remove unused Android.mk under device/google/raviole am: bd9ce8035d
...
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2836216
Change-Id: Ibe400a5c48abd7739ec42d1c110e726725c807b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-20 03:23:53 +00:00
Herbert Xue
bd9ce8035d
Remove unused Android.mk under device/google/raviole
...
Bug: 311522698
Test: NA
Change-Id: Idd76734bcb56ff3480dcb11ffb0f617ccdbb94b6
2023-11-17 13:22:04 +08:00
Ankur Bakshi
3d53287970
Update raven SVN to 74 am: d149063ee2
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/25292515
Change-Id: I1c4f7072546a23bdc8d42d78c0cfa864cd047d51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16 04:29:08 +00:00
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
Ankur Bakshi
d149063ee2
Update raven SVN to 74
...
Bug: 309529736
Change-Id: If979440846ea1bb42448118fa778dc908e71c172
2023-11-16 03:41:42 +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
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
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