Commit graph

1882 commits

Author SHA1 Message Date
Treehugger Robot
a46b846462 Merge "Add aosp_bluejay_hwasan" into main am: 20153b7051 am: fee2a1d564 am: f22c744c3c
Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2729338

Change-Id: If0c51231eb6e8853404fae195a8d41425c9e8de3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 01:11:40 +00:00
Xin Li
2f0be77d5b [automerger skipped] Merge Android U (ab/10368041) am: 2a93fae2a8 -s ours am: effae880f2 -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: If16ad515f934965fbd457b9baf2601af001f307f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 00:34:58 +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
Treehugger Robot
68401bd4db Merge "gps: Disable Vzw SUPL OTDOA" into udc-dev am: a588213208 am: d3841a1741
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24220183

Change-Id: I3a789a2f378c4d19266d68d5969b9d653b578fbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 23:24:22 +00:00
Treehugger Robot
7ca4b8c6f2 Merge "gps: Disable Vzw SUPL OTDOA" into udc-dev am: a588213208 am: e0ecc1e31e
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24220183

Change-Id: I7b7fcd8d87ca6f1a2f4b56ece154dce863e4e76b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 22:52:13 +00:00
Treehugger Robot
d3841a1741 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: I650f0752b6709a082b930180ffc891f5bfdc20db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 22:12:10 +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
Lokesh Kumar Goel
1029ed4408 Update bluejay SVN to 47 am: d0c9858ecd am: fd81f8b7fb
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24436878

Change-Id: I1593cfe2e70b76329709bc86782abc5a5f9e7bdb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 23:41:11 +00:00
Lokesh Kumar Goel
5259490d80 Update bluejay SVN to 47 am: d0c9858ecd am: 9b2e844f7e
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24436878

Change-Id: Icabc3950e9671f02364253accd7e8a8847a61bc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 23:40:24 +00:00
Lokesh Kumar Goel
fd81f8b7fb Update bluejay SVN to 47 am: d0c9858ecd
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24436878

Change-Id: Ic4c223ac5754d8b5cae81417e31396fc836b0ed5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 22:55:50 +00:00
Lokesh Kumar Goel
9b2e844f7e Update bluejay SVN to 47 am: d0c9858ecd
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24436878

Change-Id: Ia4c11637fc3b01458db667e27712c8f9f127fd0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 22:55:09 +00:00
Lokesh Kumar Goel
2fb04299c4 Update bluejay SVN to 46 am: 257fa8a2d5 am: 3b4ff78f90
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24424446

Change-Id: I48f83305d95d4907d6da5338ef2b94e3ee73e731
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 06:43:01 +00:00
Lokesh Kumar Goel
19b477dd70 Update bluejay SVN to 46 am: 257fa8a2d5 am: 4a5c9d5d7e
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24424446

Change-Id: I42ff157a1c73240d9a382143fd10843f913b1854
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 06:42:09 +00:00
Lokesh Kumar Goel
3b4ff78f90 Update bluejay SVN to 46 am: 257fa8a2d5
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24424446

Change-Id: I50b5e6fcf60cc7fbc869440923ec3c2432af0f80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 05:58:18 +00:00
Lokesh Kumar Goel
4a5c9d5d7e Update bluejay SVN to 46 am: 257fa8a2d5
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24424446

Change-Id: Ia7732f45de9dad075340f2876590c7fcd26c7af7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 05:57:37 +00:00
Lokesh Kumar Goel
d0c9858ecd Update bluejay SVN to 47
Bug: 295937899
Change-Id: Iecbf06a898f2c57da1ec29f6e5eb35241a3ec4f3
2023-08-16 05:38:55 +00:00
Lokesh Kumar Goel
257fa8a2d5 Update bluejay SVN to 46
Bug: 295937899
Change-Id: I77611e1da02e476e85804b24b8dee51dbdefce13
2023-08-15 00:10:58 +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
Bassem Khalife
c49b52733c Update bluejay SVN to 45 am: 3d9216ab4a am: f146a12e58
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24407407

Change-Id: I8a5653787db4c0af6cd821c85c625100bf975ef3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-12 00:16:07 +00:00
Bassem Khalife
c7e75e3567 Update bluejay SVN to 45 am: 3d9216ab4a am: 20e2282215
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24407407

Change-Id: Ica730de4f4614be7d649c7cea75f480475e92d16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-12 00:14:13 +00:00
Bassem Khalife
f146a12e58 Update bluejay SVN to 45 am: 3d9216ab4a
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24407407

Change-Id: I0e819abdf84525d9ebd1f31b4efd99148e4181fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-11 23:29:45 +00:00
Bassem Khalife
20e2282215 Update bluejay SVN to 45 am: 3d9216ab4a
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24407407

Change-Id: I0d0c611c1c6bb33a723f5206880c8553de7c604b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-11 23:29:03 +00:00
Bassem Khalife
654efa6c29 Update bluejay SVN to 44 am: 71b17bb62b am: 0ca31d4ec8
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24405206

Change-Id: Ib2c2936db633f608a15447842bfef2da403d2ba2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-11 22:46:38 +00:00
Bassem Khalife
f83d56c16d Update bluejay SVN to 44 am: 71b17bb62b am: caf9176e91
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24405206

Change-Id: I02fe5650d515c414343cfffd3ef5c1429ebd1c64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-11 22:46:04 +00:00
Bassem Khalife
caf9176e91 Update bluejay SVN to 44 am: 71b17bb62b
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24405206

Change-Id: Iebd4b7aaffe6c7192d714dcd9b48ff34ecc147b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-11 22:04:29 +00:00
Bassem Khalife
0ca31d4ec8 Update bluejay SVN to 44 am: 71b17bb62b
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24405206

Change-Id: I9436ef6efbb2e7fb8c7f3c90d24a986da83defa7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-11 22:00:24 +00:00
Bassem Khalife
3d9216ab4a Update bluejay SVN to 45
Bug: 289414927
Change-Id: I5e7ecc45c732b5711d076b1e5783355a07c92846
2023-08-11 21:02:31 +00:00
Bassem Khalife
71b17bb62b Update bluejay SVN to 44
Bug: 289414927
Change-Id: Ie95d32418e5d16a10d3eeab462df857094b730c6
2023-08-11 19:42:19 +00:00
Bassem Khalife
d6f43ad5be Update bluejay SVN to 43 am: 21f4d455ff am: d2e21097b3
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24392813

Change-Id: Iee836a4354e9c3411f513eed16797f36d1d3e359
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-10 21:04:01 +00:00
Bassem Khalife
9d0839ca9f Update bluejay SVN to 43 am: 21f4d455ff am: 5af6a9f8ad
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24392813

Change-Id: I3052bc6806616e2523e5e51848316b79d8444c0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-10 21:03:03 +00:00
Bassem Khalife
d2e21097b3 Update bluejay SVN to 43 am: 21f4d455ff
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24392813

Change-Id: I5c2a9020d760cadd1aeb5a39c866d8962709e5fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-10 20:16:53 +00:00
Bassem Khalife
5af6a9f8ad Update bluejay SVN to 43 am: 21f4d455ff
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/24392813

Change-Id: Icd9772cf068209361974742ef4cdd7d773c0955f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-10 20:12:37 +00:00
Bassem Khalife
21f4d455ff Update bluejay SVN to 43
Bug: 289414927
Change-Id: Iccee70454c4849fa84a84f915be432971af9404b
2023-08-10 17:39:47 +00:00
Edwin Tung
6ce7ba9e0b gps: Disable Vzw SUPL OTDOA
Bug: 293213801

Test: OTDOA disabled
Change-Id: I048fb789e143e975cfc54765ad220ad9ed248c2e
2023-07-27 13:43:01 +08:00
Bill Yi
92ba0f60aa [automerger skipped] Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE am: fa9ca262c2 -s ours am: 93ee4357c7 -s ours am: 14c0850f74 -s ours am: 2e786881f9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I78aec8309c9c6cda448acb3fc3f55e98655c583d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 17:43:07 +00:00
Bill Yi
2e786881f9 [automerger skipped] Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE am: fa9ca262c2 -s ours am: 93ee4357c7 -s ours am: 14c0850f74 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iae18e0b5b50dad4e1c97cbdaffd7c3fe0a8ae051
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 17:21:22 +00:00
Bill Yi
14c0850f74 [automerger skipped] Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE am: fa9ca262c2 -s ours am: 93ee4357c7 -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: I5c3e7c2bafad5b5e59dfb7116991516f4d444284
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 14:51:37 +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
Bassem Khalife
1ad91fceee Update bluejay SVN to 42 am: fb0f5bffce am: 7d4f75081a
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/23864761

Change-Id: I5a7ff19e2d2962209c37822778b970faa60583fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 05:02:10 +00:00
Bassem Khalife
a41af0e6fd Update bluejay SVN to 42 am: fb0f5bffce am: b70b46f6fc
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/23864761

Change-Id: I673eb546570828f04c2b8bde44e9a4d5e931e3b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 04:57:03 +00:00
Bassem Khalife
7d4f75081a Update bluejay SVN to 42 am: fb0f5bffce
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/23864761

Change-Id: I20686d1b36061692f9e0a458de945e60763e20e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 04:16:52 +00:00
Bassem Khalife
b70b46f6fc Update bluejay SVN to 42 am: fb0f5bffce
Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/23864761

Change-Id: Iaa6841c3f095ea97e62f117418c4850d9c30ddd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 04:16:29 +00:00
Bassem Khalife
fb0f5bffce Update bluejay SVN to 42
Bug: 289414927
Change-Id: I11e9a8368b21216481ba34fdde427a7ed398acbc
2023-06-30 02:01:45 +00:00
Xin Li
b4178face8 [automerger skipped] Merge Android 13 QPR3 am: 57474b8846 -s ours am: b4a4abfd8a -s ours am: 1d7f12def0 -s ours am: 90c9ee57a9 -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: Ibc774b171728a262550a02eaf747af607c20c21c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-27 01:14:16 +00:00