Roshan Pius
21db4433f7
Revert^2 "raviole(nfc): Modify NFC overlays for NFC apex"
...
35ad1b0498
Bug: 303286040
Test: Compiles
Change-Id: I0191f8f24a2dc028a0347766c057aefdc142ed3c
2023-12-04 13:51:34 -08:00
Roshan Pius
cd3dd4d199
Revert^2 "raven: Replace NFC app with NFC apex"
...
c0c4781f17
Bug: 303286040
Test: Compiles
Change-Id: I51a882988a933836ebf9426c4a6548ee3a97aa42
2023-12-04 11:54:37 -08:00
Ankur Bakshi
69cf853ced
Update oriole SVN to 75 am: b1bc52470f
am: eee9dcf524
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/25498988
Change-Id: I2a51256186925af4f0c730ead959fd221c99bda1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 23:05:32 +00:00
Ankur Bakshi
c4854cf918
Update raven SVN to 75 am: 31d7180356
am: c77b8975e9
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/25498750
Change-Id: Ibf1f5c4674987b45374be9b495d0654921e79a03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 23:05:23 +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
3d7f602bc4
Merge "Remove unused Android.mk under device/google/raviole am: bd9ce8035d
am: 4bc83922f9
" into udc-qpr-dev-plus-aosp am: 8ab204e5f3
...
Original change: undetermined
Change-Id: Ie175dd873e40db20a9cf67e8e46495e6a45d5350
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-21 04:04:37 +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
63c3d6722f
Remove unused Android.mk under device/google/raviole am: bd9ce8035d
am: 88aa471023
am: 870b074231
...
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2836216
Change-Id: I959c7fa992df55519977451801fba7f033e067ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-21 03:14:57 +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
Cheng Chang
30b7043080
gps: Enable Vzw SUPL OTDOA
...
Bug: 310795649
Test: OTDOA test in b/310795649
Change-Id: I61e1fc51ac2f066025bd3ae57bb880c14fb0c5ed
2023-11-16 05:57:31 +00:00
Ankur Bakshi
5d9959acd9
Update raven SVN to 74 am: d149063ee2
am: 3d53287970
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/25292515
Change-Id: Id2d000a5bc7d7522eb1add7296190168b000f0cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16 04:59:21 +00:00
Ankur Bakshi
ac2994563b
Update oriole SVN to 74 am: 7b6a615aa8
am: 6a7ae4bd32
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/25291797
Change-Id: I80a44cc8c58a43d401ac3ad608350de9e7e7a62c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16 04:59:09 +00: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
ca07a9d1d2
[automerger skipped] Merge "Revert "raviole(nfc): Modify NFC overlays for NFC apex"" into main am: f3e7300c21
am: d75de74bcb
-s ours am: eb2833b193
-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: Ide882a0ccb8b324048cc2e967dc3583a82771584
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 23:34:35 +00:00
Roshan Pius
43cde66d41
[automerger skipped] Revert "raven: Replace NFC app with NFC apex" am: 84b70f6ffc
am: df8db2ed75
am: 14a8ceaafb
-s ours
...
am skip reason: Merged-In I9298ad5be151b96e3b77301490feb8aaee3231b1 with SHA-1 c0c4781f17
is already in history
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2817934
Change-Id: I784be365487f72020de4a964b06c78da353b4d8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 23:34:20 +00:00
Roshan Pius
6f6cf1244d
[automerger skipped] Merge "Revert "raviole(nfc): Modify NFC overlays for NFC apex"" into main am: f3e7300c21
am: 78f9ccc598
am: b77ffcacfb
-s ours
...
am skip reason: Merged-In I2716c95474b35fff59726c1cb9a54e5ea42f941e with SHA-1 35ad1b0498
is already in history
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2818129
Change-Id: I826d5840f94f8e6e7c426eabc81bb5e900327c5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 23:30:52 +00:00
Roshan Pius
9e08aea445
[automerger skipped] Revert "raven: Replace NFC app with NFC apex" am: 84b70f6ffc
am: 3f84f73a17
am: 981140407a
-s ours
...
am skip reason: Merged-In I9298ad5be151b96e3b77301490feb8aaee3231b1 with SHA-1 c0c4781f17
is already in history
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2817934
Change-Id: I89387cc83c19d4eaabd692318f492f3ecf93418a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 23:30:33 +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
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
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