Commit graph

1935 commits

Author SHA1 Message Date
Roshan Pius
b5ff2c83d3 Revert "bluejay: 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:75bff8a95f3e1fbeeaffce4d2fe720152761edbd)
Merged-In: Ie6d5643f77a828f9a4254edd0ecf4fe28460a2f6
Change-Id: Ie6d5643f77a828f9a4254edd0ecf4fe28460a2f6
2023-11-07 06:10:47 +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
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
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
27a7db0162 Merge Android 14
Bug: 298295554
Merged-In: Iecbf06a898f2c57da1ec29f6e5eb35241a3ec4f3
Change-Id: I9a5965085ad017c52637497f38e34100e039c8cd
2023-10-05 15:32:08 -07:00
Xin Li
856bb61b7d Merge UP1A.231005.007
Bug: 291102124
Merged-In: Iecbf06a898f2c57da1ec29f6e5eb35241a3ec4f3
Change-Id: I2082f1cf1b4b9e607ff710b223552f66babbb122
2023-09-27 16:04:11 -07: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
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
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
Android Build Coastguard Worker
1feb1b3573 Merge cherrypicks of ['googleplex-android-review.googlesource.com/24407407'] into sparse-10685236-L22000000962658982.
SPARSE_CHANGE: I5e7ecc45c732b5711d076b1e5783355a07c92846

Change-Id: I6637a7fa12ff54a1a88a012e3d6e9fbcf635844a
2023-08-20 08:31:33 +00:00
Bassem Khalife
606df2388a 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-20 08:30:43 +00:00
Android Build Coastguard Worker
0f5b815396 [coastguard skipped] Merge sparse cherrypicks from sparse-10656238-L62300000962563337 into udc-release.
COASTGUARD_SKIP: I5e7ecc45c732b5711d076b1e5783355a07c92846
COASTGUARD_SKIP: I2aef39ad72c40092933c576d5c20b9dae5f7de90

Change-Id: I0e99a4a2c8d21321d7cd6ac4b909fb42fa09612f
2023-08-14 22:56:52 +00:00
Android Build Coastguard Worker
c77ad6a2d8 Merge cherrypicks of ['googleplex-android-review.googlesource.com/24407407'] into sparse-10656238-L62300000962563337.
SPARSE_CHANGE: I5e7ecc45c732b5711d076b1e5783355a07c92846

Change-Id: I2aef39ad72c40092933c576d5c20b9dae5f7de90
2023-08-14 22:47:02 +00:00
Bassem Khalife
40b8836aeb 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-14 22:46:08 +00:00
Xin Li
2a93fae2a8 Merge Android U (ab/10368041)
Bug: 291102124
Merged-In: I59500ba819f0c36f130b26b86b9dfe4415fa1792
Change-Id: Iffe4bd4cdf12ea8795bee3d48d6018222d11360a
2023-08-14 15:32:41 -07:00
Android Build Coastguard Worker
6e09e2e76e Merge cherrypicks of ['googleplex-android-review.googlesource.com/24392813', 'googleplex-android-review.googlesource.com/24405206'] into udc-release.
Change-Id: Iac2859758008ea4b2e0a416a00108323a2f47c70
2023-08-14 19:53:00 +00:00
Bassem Khalife
c8d4239669 Update bluejay SVN to 44
Bug: 289414927
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:71b17bb62bf1cdce95b4aff365e5bd667a6cc391)
Merged-In: Ie95d32418e5d16a10d3eeab462df857094b730c6
Change-Id: Ie95d32418e5d16a10d3eeab462df857094b730c6
2023-08-14 19:51:15 +00:00
Bassem Khalife
85067e5c12 Update bluejay SVN to 43
Bug: 289414927
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:21f4d455ffc60571e424e50e8ffe64668a4e906d)
Merged-In: Iccee70454c4849fa84a84f915be432971af9404b
Change-Id: Iccee70454c4849fa84a84f915be432971af9404b
2023-08-14 19:51:06 +00:00
Android Build Coastguard Worker
ca1a45f851 [coastguard skipped] Merge sparse cherrypicks from sparse-10644925-L98600000962542387 into udc-release.
COASTGUARD_SKIP: Ifaab724207e354e44df14dc513218a637cf40ec7
COASTGUARD_SKIP: Iccee70454c4849fa84a84f915be432971af9404b

Change-Id: Ia61a8e3627a83c02682fe5ec5baf6e6185a88662
2023-08-12 00:48:17 +00:00
Android Build Coastguard Worker
231d1b58ad Merge cherrypicks of ['googleplex-android-review.googlesource.com/24392813'] into sparse-10644925-L98600000962542387.
SPARSE_CHANGE: Iccee70454c4849fa84a84f915be432971af9404b

Change-Id: Ifaab724207e354e44df14dc513218a637cf40ec7
2023-08-12 00:44:06 +00:00
Bassem Khalife
cbc7228875 Update bluejay SVN to 43
Bug: 289414927
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:21f4d455ffc60571e424e50e8ffe64668a4e906d)
Merged-In: Iccee70454c4849fa84a84f915be432971af9404b
Change-Id: Iccee70454c4849fa84a84f915be432971af9404b
2023-08-12 00:43:10 +00:00
Bill Yi
93ee4357c7 [automerger skipped] Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE am: fa9ca262c2 -s ours
am skip reason: Merged-In I7c78e791aa1b29ac80d8285a58ce06ddc09cc573 with SHA-1 b4a4abfd8a is already in history

Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2654238

Change-Id: Ib66f1a292d6b6ecd0ba89aee3bdb2f67c04c17af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 14:10:26 +00:00
Bill Yi
fa9ca262c2 Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE
Merged-In: I7c78e791aa1b29ac80d8285a58ce06ddc09cc573
Merged-In: I8a7c335914e0aad8b10a3a238e7ba719fe3019fe
Merged-In: I20686d1b36061692f9e0a458de945e60763e20e7
Change-Id: I96b80ae6f68143b7be094b18954dd2a98352c901
2023-07-11 15:27:13 -07:00
Android Build Coastguard Worker
2c57e83b1c Merge cherrypicks of ['googleplex-android-review.googlesource.com/23809847', 'googleplex-android-review.googlesource.com/23864761'] into udc-release.
Change-Id: Ib867e368928a55165608504e58eca8e11cb61310
2023-06-30 03:19:47 +00:00
Bassem Khalife
aa6d68978a Update bluejay SVN to 42
Bug: 289414927
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:fb0f5bffceaced690714728c6a0cfe8d85ae1d9e)
Merged-In: I11e9a8368b21216481ba34fdde427a7ed398acbc
Change-Id: I11e9a8368b21216481ba34fdde427a7ed398acbc
2023-06-30 03:14:06 +00:00
Lokesh Kumar Goel
a97531e83b Update bluejay SVN to 41
Bug: 285692955
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ac330e38bf5b1b1228021dd4f6ec2b1ddccaa99d)
Merged-In: Ia8f9db8eb23134db3eef2c7354da1f7ec3946f51
Change-Id: Ia8f9db8eb23134db3eef2c7354da1f7ec3946f51
2023-06-30 03:14:01 +00:00
Xin Li
b4a4abfd8a [automerger skipped] Merge Android 13 QPR3 am: 57474b8846 -s ours
am skip reason: Merged-In Ie5ec5ebbf9b25dd6e83ec66aa0b0d869f484fd01 with SHA-1 a87770cca5 is already in history

Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2635392

Change-Id: I7c78e791aa1b29ac80d8285a58ce06ddc09cc573
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-26 22:57:52 +00:00
Xin Li
57474b8846 Merge Android 13 QPR3
Bug: 275386652
Merged-In: Ie5ec5ebbf9b25dd6e83ec66aa0b0d869f484fd01
Change-Id: Icf715d66021bec4741c86bf3793b2c5d9beaf254
2023-06-21 15:14:32 -07:00
Android Build Coastguard Worker
3751860a59 Snap for 10322758 from 1690c6ee26 to udc-release
Change-Id: I433e20cb10920bf19c65ab42d9a19514fcdcf713
2023-06-14 23:02:01 +00:00
paulsu
6875c3d2e2 Remove UgBgGroupThrottle node to keep ug_bg_group_throttle 308 by default am: 1690c6ee26
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/23686047

Change-Id: I59500ba819f0c36f130b26b86b9dfe4415fa1792
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 08:59:09 +00:00
paulsu
1690c6ee26 Remove UgBgGroupThrottle node to keep ug_bg_group_throttle 308 by default
Bug: 280258727
Test: Found regression in b/286002292, local test.
Change-Id: Ia1e738be922799f2f18493143bb9aa0c2b3fbfa3
Signed-off-by: paulsu <paulsu@google.com>
2023-06-14 05:24:40 +00:00