Roshan Pius
13b9a3e096
Revert "bluejay(nfc): Modify NFC overlays for NFC apex" am: a940645a6e
...
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2818124
Change-Id: I7d34f2e80cc65bfa0073cb843047ae71feaebf4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 21:48:53 +00:00
Becker (Chan-Ying) Lien
794f6831d7
Update ShannonIms CERTIFICATE to PRESIGNED
...
Bug: 298956897
Change-Id: I0680982853a630b2c3744278f7a09b356ff2cb69
2023-11-07 19:11:42 +00:00
Roshan Pius
a940645a6e
Revert "bluejay(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: Ia4d272bb55ed7fd9fc12090a6afde96fff84a9da
Change-Id: Ia4d272bb55ed7fd9fc12090a6afde96fff84a9da
2023-11-06 19:44:18 +00:00
Greg Kaiser
d03c28f14c
Fix lunch choices for git_main am: bb35cfaea7
...
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2809994
Change-Id: I5c7ecc1115e20a1a9ecc512f6b1212f27623ebf1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-30 17:23:43 +00:00
Greg Kaiser
bb35cfaea7
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:c0159563f3835c858d6587bebcbd87d123113530 )
Merged-In: I47590aaf84bd2481d53c04889c2963e02b7a816d
Change-Id: I47590aaf84bd2481d53c04889c2963e02b7a816d
2023-10-30 16:41:50 +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
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
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
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
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
Roshan Pius
1c66031b9e
Merge "bluejay: Replace NFC app with NFC apex" into main
2023-10-16 18:31:03 +00:00
Roshan Pius
f67025292b
bluejay: Replace NFC app with NFC apex
...
Bug: 303286040
Test: Compiles
Merged-In: Ief6317a97f4c0208e506afc17ed6ab37e81d2db1
Change-Id: Ief6317a97f4c0208e506afc17ed6ab37e81d2db1
2023-10-13 18:03:57 +00:00
Xin Li
53d5d3e010
[automerger skipped] Merge Android 14 am: 27a7db0162
-s ours am: b99740f973
-s ours
...
am skip reason: Merged-In Iecbf06a898f2c57da1ec29f6e5eb35241a3ec4f3 with SHA-1 0ea630f587
is already in history
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2775835
Change-Id: Iaf4888b74fd9817762fe4cf0d3b3d372c8affd9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 08:58:56 +00:00
Xin Li
b99740f973
[automerger skipped] Merge Android 14 am: 27a7db0162
-s ours
...
am skip reason: Merged-In Iecbf06a898f2c57da1ec29f6e5eb35241a3ec4f3 with SHA-1 0ea630f587
is already in history
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2775835
Change-Id: I7882c11a29328f5077626b90364f28562b969df2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 07:51:50 +00:00
Xin Li
27a7db0162
Merge Android 14
...
Bug: 298295554
Merged-In: Iecbf06a898f2c57da1ec29f6e5eb35241a3ec4f3
Change-Id: I9a5965085ad017c52637497f38e34100e039c8cd
2023-10-05 15:32:08 -07:00
Xin Li
a3e430e4e4
[automerger skipped] Merge UP1A.231005.007 am: 856bb61b7d
-s ours
...
am skip reason: Merged-In Iecbf06a898f2c57da1ec29f6e5eb35241a3ec4f3 with SHA-1 d0c9858ecd
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24879335
Change-Id: I0ef2a99b0d9876400a0c992206a19f54ce99a738
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-29 07:15:42 +00:00
Xin Li
856bb61b7d
Merge UP1A.231005.007
...
Bug: 291102124
Merged-In: Iecbf06a898f2c57da1ec29f6e5eb35241a3ec4f3
Change-Id: I2082f1cf1b4b9e607ff710b223552f66babbb122
2023-09-27 16:04:11 -07:00
Ankur Bakshi
37e2228f47
Update bluejay SVN to 49 am: b2ee8ab0f5
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24697428
Change-Id: I0fcf858237510c9abde501328184518fbf37e528
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 18:50:49 +00:00
Ankur Bakshi
83bd8adfb0
Update bluejay SVN to 48 am: d293f75732
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24686398
Change-Id: I9752865b3210328a789ea985594ca8e6f805b531
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 18:50:47 +00:00
Ankur Bakshi
b2ee8ab0f5
Update bluejay SVN to 49
...
Bug: 298087649
Change-Id: I36c2925303fecddc613d25e34faaada5d5ed4485
2023-09-07 23:51:48 +00:00
Ankur Bakshi
d293f75732
Update bluejay SVN to 48
...
Bug: 298087649
Change-Id: I18efad473df907d05dd61dd3ad4c28f3a6c2d463
2023-09-07 02:41:57 +00:00
Xin Li
cd93e5598a
[automerger skipped] Merge UP1A.230905.019 am: 791d3759a7
-s ours
...
am skip reason: Merged-In I5e7ecc45c732b5711d076b1e5783355a07c92846 with SHA-1 3d9216ab4a
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24625489
Change-Id: Id167c4d7a74539f27681b768e4cef90899684730
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-05 19:45:31 +00:00
Xin Li
791d3759a7
Merge UP1A.230905.019
...
Merged-In: I5e7ecc45c732b5711d076b1e5783355a07c92846
Change-Id: I3d31ca80c8ab03ed919748217efc9dae404b9b2e
2023-08-31 12:10:57 -07:00
Android Build Coastguard Worker
dd597adea0
[coastguard skipped] Merge sparse cherrypicks from sparse-10740638-L17800000962853027 into udc-release.
...
COASTGUARD_SKIP: I2bcf78393b58127cba966c1fb6b61a840009437f
COASTGUARD_SKIP: Iecbf06a898f2c57da1ec29f6e5eb35241a3ec4f3
Change-Id: I751d95dccd09c16dc07aa1fda875683cb70bc092
2023-08-30 23:17:35 +00:00
Android Build Coastguard Worker
78784e9977
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24436878'] into sparse-10740638-L17800000962853027.
...
SPARSE_CHANGE: Iecbf06a898f2c57da1ec29f6e5eb35241a3ec4f3
Change-Id: I2bcf78393b58127cba966c1fb6b61a840009437f
2023-08-30 23:10:16 +00:00
Lokesh Kumar Goel
0ea630f587
Update bluejay SVN to 47
...
Bug: 295937899
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d0c9858ecd1aedfb240a507a08f85df3cf1332e3 )
Merged-In: Iecbf06a898f2c57da1ec29f6e5eb35241a3ec4f3
Change-Id: Iecbf06a898f2c57da1ec29f6e5eb35241a3ec4f3
2023-08-30 23:08:22 +00:00
Android Build Coastguard Worker
76a33059f5
[coastguard skipped] Merge sparse cherrypicks from sparse-10739010-L93800000962847818 into udc-release.
...
COASTGUARD_SKIP: Iecbf06a898f2c57da1ec29f6e5eb35241a3ec4f3
COASTGUARD_SKIP: I5518d67102d3997bb8bd694bb8396402c33bbc21
Change-Id: I399e80a157a431009c571189c49f29a66ee32938
2023-08-30 18:58:29 +00:00
Android Build Coastguard Worker
24c5892464
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24436878'] into sparse-10739010-L93800000962847818.
...
SPARSE_CHANGE: Iecbf06a898f2c57da1ec29f6e5eb35241a3ec4f3
Change-Id: I5518d67102d3997bb8bd694bb8396402c33bbc21
2023-08-30 18:50:41 +00:00
Lokesh Kumar Goel
620a6776c0
Update bluejay SVN to 47
...
Bug: 295937899
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d0c9858ecd1aedfb240a507a08f85df3cf1332e3 )
Merged-In: Iecbf06a898f2c57da1ec29f6e5eb35241a3ec4f3
Change-Id: Iecbf06a898f2c57da1ec29f6e5eb35241a3ec4f3
2023-08-30 18:48:29 +00:00
Treehugger Robot
f22c744c3c
Merge "Add aosp_bluejay_hwasan" into main am: 20153b7051
am: fee2a1d564
...
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2729338
Change-Id: I897901016c94cf34695b5d04fe6c91fa4b7fa3b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 00:27:46 +00:00
Xin Li
effae880f2
[automerger skipped] Merge Android U (ab/10368041) am: 2a93fae2a8
-s ours
...
am skip reason: Merged-In I59500ba819f0c36f130b26b86b9dfe4415fa1792 with SHA-1 6875c3d2e2
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24182586
Change-Id: Id116f61dc8881f95476c32bcc7b453f86f88eb99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28 23:58:58 +00:00
Treehugger Robot
fee2a1d564
Merge "Add aosp_bluejay_hwasan" into main am: 20153b7051
...
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2729338
Change-Id: I952166410ecde868795fc4a6b1686aefc3674b2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28 22:54:51 +00:00
Treehugger Robot
20153b7051
Merge "Add aosp_bluejay_hwasan" into main
2023-08-28 21:30:57 +00:00
Florian Mayer
59488616be
Add aosp_bluejay_hwasan
...
Bug: 297918380
Change-Id: I906deed8db5f347263c4035d3b6235bd9960055a
2023-08-28 13:10:44 -07:00
Android Build Coastguard Worker
196fee151c
[coastguard skipped] Merge sparse cherrypicks from sparse-10705648-L70200000962736881 into udc-release.
...
COASTGUARD_SKIP: Icb1eebd8d98233f2e329636e2806dcf976c0984e
COASTGUARD_SKIP: Iecbf06a898f2c57da1ec29f6e5eb35241a3ec4f3
Change-Id: Ic63b5847ce423489cb666e242c97f5961ca21586
2023-08-23 23:46:48 +00:00
Android Build Coastguard Worker
2ae375c32f
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24436878'] into sparse-10705648-L70200000962736881.
...
SPARSE_CHANGE: Iecbf06a898f2c57da1ec29f6e5eb35241a3ec4f3
Change-Id: Icb1eebd8d98233f2e329636e2806dcf976c0984e
2023-08-23 23:40:36 +00:00
Lokesh Kumar Goel
69d65fa1d1
Update bluejay SVN to 47
...
Bug: 295937899
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d0c9858ecd1aedfb240a507a08f85df3cf1332e3 )
Merged-In: Iecbf06a898f2c57da1ec29f6e5eb35241a3ec4f3
Change-Id: Iecbf06a898f2c57da1ec29f6e5eb35241a3ec4f3
2023-08-23 23:38:53 +00:00
Android Build Coastguard Worker
f5690cd187
[coastguard skipped] Merge sparse cherrypicks from sparse-10696112-L14300000962710292 into udc-release.
...
COASTGUARD_SKIP: Iecbf06a898f2c57da1ec29f6e5eb35241a3ec4f3
COASTGUARD_SKIP: I9d015affca1495ebe671586f21ad6b408eb170b1
Change-Id: I37921f0747d7ab1f207627f1ce92f80bdde54403
2023-08-22 21:16:51 +00:00
Android Build Coastguard Worker
e78da1e3a8
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24436878'] into sparse-10696112-L14300000962710292.
...
SPARSE_CHANGE: Iecbf06a898f2c57da1ec29f6e5eb35241a3ec4f3
Change-Id: I9d015affca1495ebe671586f21ad6b408eb170b1
2023-08-22 21:11:14 +00:00
Lokesh Kumar Goel
b407050b06
Update bluejay SVN to 47
...
Bug: 295937899
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d0c9858ecd1aedfb240a507a08f85df3cf1332e3 )
Merged-In: Iecbf06a898f2c57da1ec29f6e5eb35241a3ec4f3
Change-Id: Iecbf06a898f2c57da1ec29f6e5eb35241a3ec4f3
2023-08-22 21:09:19 +00:00
Android Build Coastguard Worker
6fea6ad7fb
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24407407', 'googleplex-android-review.googlesource.com/24424446', 'googleplex-android-review.googlesource.com/24220183'] into udc-release.
...
Change-Id: I4bf439ccb258451bf89ac2ffb442ca47b981e77d
2023-08-22 02:18:36 +00:00
Edwin Tung
e6bd74cb39
gps: Disable Vzw SUPL OTDOA
...
Bug: 293213801
Test: OTDOA disabled
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:6ce7ba9e0b94d15c658a01ff1de5fba815204f65 )
Merged-In: I048fb789e143e975cfc54765ad220ad9ed248c2e
Change-Id: I048fb789e143e975cfc54765ad220ad9ed248c2e
2023-08-22 02:06:43 +00:00
Lokesh Kumar Goel
97d316e7d6
Update bluejay SVN to 46
...
Bug: 295937899
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:257fa8a2d5c12c602bf71e260bc685f2310fdff4 )
Merged-In: I77611e1da02e476e85804b24b8dee51dbdefce13
Change-Id: I77611e1da02e476e85804b24b8dee51dbdefce13
2023-08-22 02:06:34 +00:00
Bassem Khalife
38bb33ab98
Update bluejay SVN to 45
...
Bug: 289414927
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:3d9216ab4a8f0300de9ceabac0261df69743e3e4 )
Merged-In: I5e7ecc45c732b5711d076b1e5783355a07c92846
Change-Id: I5e7ecc45c732b5711d076b1e5783355a07c92846
2023-08-22 02:06:25 +00:00
Treehugger Robot
e0ecc1e31e
Merge "gps: Disable Vzw SUPL OTDOA" into udc-dev am: a588213208
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24220183
Change-Id: Ib5f3ab894d6b2e8411aad9a1d3d9e6d9365f6551
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 22:11:12 +00:00
Treehugger Robot
a588213208
Merge "gps: Disable Vzw SUPL OTDOA" into udc-dev
2023-08-21 21:20:40 +00:00
Android Build Coastguard Worker
1cba61c23d
[coastguard skipped] Merge sparse cherrypicks from sparse-10685236-L22000000962658982 into udc-release.
...
COASTGUARD_SKIP: I6637a7fa12ff54a1a88a012e3d6e9fbcf635844a
COASTGUARD_SKIP: I5e7ecc45c732b5711d076b1e5783355a07c92846
Change-Id: I18bde712949eb1dac942620d273bbd8abf8f1005
2023-08-20 08:36:03 +00:00