Commit graph

1776 commits

Author SHA1 Message Date
Xin Li
4fcacced52 [automerger skipped] Merge "Merge Android U (ab/10368041)" into aosp-main-future am: 66e687a2a4 -s ours am: f4b38e7b46 -s ours
am skip reason: Merged-In Ia11da7d008b96baf8aa7b2aa057ae87164b36052 with SHA-1 b689a2a0ae is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24182703

Change-Id: I90d949caaa1be25870115a8ed82732c52aed4eef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 00:40:44 +00:00
Xin Li
721d839d2a [automerger skipped] Merge Android U (ab/10368041) am: d1c9942792 -s ours am: b7cf79b50d -s ours
am skip reason: Merged-In Ia11da7d008b96baf8aa7b2aa057ae87164b36052 with SHA-1 b689a2a0ae is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24182703

Change-Id: Iaf68020e3327bc52f0dd2141c4d5b669016d575c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 00:35:25 +00:00
Florian Mayer
4165369e1c Add aosp_felix_hwasan am: c2556c4c61 am: 50889ad4db am: 9c8f7cff7b
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2729295

Change-Id: Idb24b83a65598fc76197639461a0fb4e7b7470e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 00:26:03 +00:00
Xin Li
f4b38e7b46 [automerger skipped] Merge "Merge Android U (ab/10368041)" into aosp-main-future am: 66e687a2a4 -s ours
am skip reason: Merged-In Ia11da7d008b96baf8aa7b2aa057ae87164b36052 with SHA-1 b689a2a0ae is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24182703

Change-Id: Ief104b9a8579ed786718adf55dfad6e0ef4a2f06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 00:04:44 +00:00
Xin Li
b7cf79b50d [automerger skipped] Merge Android U (ab/10368041) am: d1c9942792 -s ours
am skip reason: Merged-In Ia11da7d008b96baf8aa7b2aa057ae87164b36052 with SHA-1 b689a2a0ae is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24182703

Change-Id: I261bdf7ef23cfabc3ed6a0fe67b2044509d108cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28 23:59:25 +00:00
Florian Mayer
9c8f7cff7b Add aosp_felix_hwasan am: c2556c4c61 am: 50889ad4db
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2729295

Change-Id: Idac8aa35d09e6eeaa92a9125ee39ce2421ca1096
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28 23:42:54 +00:00
Xin Li
66e687a2a4 Merge "Merge Android U (ab/10368041)" into aosp-main-future 2023-08-28 22:12:23 +00:00
Florian Mayer
50889ad4db Add aosp_felix_hwasan am: c2556c4c61
Original change: https://android-review.googlesource.com/c/device/google/felix/+/2729295

Change-Id: I29e672a12cd2cec8bcb880c19f99dbd03fe2aac7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28 22:11:26 +00:00
Florian Mayer
c2556c4c61 Add aosp_felix_hwasan
Bug: 297918380
Change-Id: I934dc696c9066bdc337a4279296b91744d0b0382
2023-08-28 13:11:01 -07:00
Treehugger Robot
47daeaeef9 Merge "gps: Disable Vzw SUPL OTDOA" into udc-dev am: 4de7df1c5e am: 99e0b6fff8
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24220184

Change-Id: Icb654d8ba28c5f9e919e6cfc1b24f75b2bcbd9e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 23:24:22 +00:00
Treehugger Robot
24f93f78c5 Merge "gps: Disable Vzw SUPL OTDOA" into udc-dev am: 4de7df1c5e am: 4935f7c831
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24220184

Change-Id: Id789cef46760ae032e5e3555294f680bf39118db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 22:52:12 +00:00
Treehugger Robot
99e0b6fff8 Merge "gps: Disable Vzw SUPL OTDOA" into udc-dev am: 4de7df1c5e
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24220184

Change-Id: I583532535b86f8e7b771d3ca1fe0046a67ae7e5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 22:12:09 +00:00
Treehugger Robot
4935f7c831 Merge "gps: Disable Vzw SUPL OTDOA" into udc-dev am: 4de7df1c5e
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24220184

Change-Id: I57a146163061e0fc6f596972f809485a1e1dd543
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 22:11:11 +00:00
Treehugger Robot
4de7df1c5e Merge "gps: Disable Vzw SUPL OTDOA" into udc-dev 2023-08-21 21:20:40 +00:00
Lokesh Kumar Goel
7d8a0dd069 Update felix SVN to 25 am: f538f8e771 am: c2ee41a877
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24436880

Change-Id: Id95ab2f3543e4df668409309027a39df41b8d26b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 23:41:19 +00:00
Lokesh Kumar Goel
693365379d Update felix SVN to 25 am: f538f8e771 am: f19d2a7074
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24436880

Change-Id: Ifb286c2e3b59a2d2ecbf5bf7cc1495c1be8d995c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 23:41:01 +00:00
Lokesh Kumar Goel
c2ee41a877 Update felix SVN to 25 am: f538f8e771
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24436880

Change-Id: I73ce1d8dd4bc99d5dbb1022b941a4b09e492a197
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 22:56:27 +00:00
Lokesh Kumar Goel
f19d2a7074 Update felix SVN to 25 am: f538f8e771
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24436880

Change-Id: Ia52b6971fd409bf90f541e8ad9e598add32acc80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 22:54:49 +00:00
Lokesh Kumar Goel
f9c209d44d Update felix SVN to 24 am: 0368e3e821 am: e5cfad4616
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24426027

Change-Id: I59c410b48d9b12e05fe377ce2346aef5be635d56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 07:05:25 +00:00
Lokesh Kumar Goel
7cc0ebfb66 Update felix SVN to 24 am: 0368e3e821 am: da35c65e38
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24426027

Change-Id: I1940d8c5343f2009c810a73ab40c9606e13e1353
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 07:05:02 +00:00
Lokesh Kumar Goel
e5cfad4616 Update felix SVN to 24 am: 0368e3e821
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24426027

Change-Id: I4441d987204814cc9cb093693dc54cfdc9c12014
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 06:20:13 +00:00
Lokesh Kumar Goel
da35c65e38 Update felix SVN to 24 am: 0368e3e821
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24426027

Change-Id: If4d2eb5779347c34a6ebd6ed70e5941f78184bfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 06:19:05 +00:00
Lokesh Kumar Goel
f538f8e771 Update felix SVN to 25
Bug: 295937899
Change-Id: I8bd0f5ef94ca1d5e118a701a4cfff58599537476
2023-08-16 05:39:45 +00:00
Lokesh Kumar Goel
0368e3e821 Update felix SVN to 24
Bug: 295937899
Change-Id: I64164674d19b1e7d49094fed2175ec7c63f9ad82
2023-08-15 00:11:52 +00:00
Xin Li
d1c9942792 Merge Android U (ab/10368041)
Bug: 291102124
Merged-In: Ia11da7d008b96baf8aa7b2aa057ae87164b36052
Change-Id: I2299d73a593a5ee839ee41e0f74c45853c982748
2023-08-14 15:33:18 -07:00
Bassem Khalife
7956b538cd Update felix SVN to 23 am: 4ecf2187a2 am: 3dd8086a92
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24394073

Change-Id: Idc53f1bebf5123769446216e93491f88fa32b8c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-11 05:38:44 +00:00
Bassem Khalife
d8a65fdbe0 Update felix SVN to 23 am: 4ecf2187a2 am: d99cd24cab
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24394073

Change-Id: Ie649758140a44aa62f8cc1a292b80bed6fb86d08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-11 05:38:00 +00:00
Bassem Khalife
3dd8086a92 Update felix SVN to 23 am: 4ecf2187a2
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24394073

Change-Id: I4663a5f7a4f5503ed6a9a2c4bf8bf5c2b5e582e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-11 04:57:56 +00:00
Bassem Khalife
d99cd24cab Update felix SVN to 23 am: 4ecf2187a2
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24394073

Change-Id: I8724f8a1935e065234181d4d0800b49e71204130
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-11 04:53:40 +00:00
Bassem Khalife
4ecf2187a2 Update felix SVN to 23
Bug: 289414927
Change-Id: I3f4936d26b869ca400be05386fc009d95cf003c2
2023-08-10 19:58:11 +00:00
Bassem Khalife
9836b0f845 Update felix SVN to 22 am: 64da307f5f am: e07c0cc9f4
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24374051

Change-Id: I79580352cf1fd265dfd70126b7905f997a893cf6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-10 06:54:42 +00:00
Bassem Khalife
99cbe680ba Update felix SVN to 22 am: 64da307f5f am: cf292b2d0b
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24374051

Change-Id: I17a0458f34cd24fc496b7574020b654a3580c042
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-10 06:54:15 +00:00
Bassem Khalife
e07c0cc9f4 Update felix SVN to 22 am: 64da307f5f
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24374051

Change-Id: I5aa534202eba0ac46817cb6154b5101d85fd6cc1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-10 06:09:42 +00:00
Bassem Khalife
cf292b2d0b Update felix SVN to 22 am: 64da307f5f
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24374051

Change-Id: Ic5da8fab59c8443367251f6363ecf7f079c0ac65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-10 06:05:53 +00:00
Bassem Khalife
64da307f5f Update felix SVN to 22
Bug: 289414927
Change-Id: I4890e0ed2191993887aa550053a827c2aca3aafe
2023-08-09 18:11:30 +00:00
Treehugger Robot
3d14c9d631 Merge "Revert "Revert "Update felix SVN to 21""" into udc-dev am: ccf9987230 am: abc08b5f71
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24338862

Change-Id: I220d65ad79c82781c5c94cfcacdde36d638b3258
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-07 00:17:15 +00:00
Treehugger Robot
1a9ea0061b Merge "Revert "Revert "Update felix SVN to 21""" into udc-dev am: ccf9987230 am: 7f776927e0
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24338862

Change-Id: I254a6a9fcc7187f4670907b17c0feeb0be6d33e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-07 00:16:34 +00:00
Treehugger Robot
abc08b5f71 Merge "Revert "Revert "Update felix SVN to 21""" into udc-dev am: ccf9987230
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24338862

Change-Id: I1ff146bba46330b77a958677c9943c51d4a02766
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-06 23:34:39 +00:00
Treehugger Robot
7f776927e0 Merge "Revert "Revert "Update felix SVN to 21""" into udc-dev am: ccf9987230
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24338862

Change-Id: I399631336c1b552a15524f94f80f813653cfb5f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-06 23:33:00 +00:00
Treehugger Robot
ccf9987230 Merge "Revert "Revert "Update felix SVN to 21""" into udc-dev 2023-08-06 22:50:33 +00:00
Neha Jain
5ee36bd203 Revert "Revert "Update felix SVN to 21""
This reverts commit b6fc908043.

Reason for revert: Need the SVN for F10 KDDI build

Bug: 289414927
Change-Id: I09e8877ac2325a0056c931ce01602fffb7e68c35
2023-08-06 22:07:17 +00:00
Treehugger Robot
6fc3ebd57b Merge "Revert "Update felix SVN to 21"" into udc-dev am: 9e3aa97625 am: a7c821840c
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24288899

Change-Id: I5e063a47a0d5ef47f25797ffe485e68ee40ccb67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-02 04:20:54 +00:00
Treehugger Robot
ca57657de5 Merge "Revert "Update felix SVN to 21"" into udc-dev am: 9e3aa97625 am: 50f1165d01
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24288899

Change-Id: I6dafdacba973467eb64e35ced836b802b80a5df0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-02 04:01:06 +00:00
Treehugger Robot
a7c821840c Merge "Revert "Update felix SVN to 21"" into udc-dev am: 9e3aa97625
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24288899

Change-Id: I9d41f856c0559055866bf4b3a3e7fafd228e6a14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-02 03:13:55 +00:00
Treehugger Robot
50f1165d01 Merge "Revert "Update felix SVN to 21"" into udc-dev am: 9e3aa97625
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24288899

Change-Id: Ibe5eb21f2299c2dd7b9a57f1a8514a888b38da8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-02 03:09:49 +00:00
Treehugger Robot
9e3aa97625 Merge "Revert "Update felix SVN to 21"" into udc-dev 2023-08-02 02:22:31 +00:00
Neha Jain
b6fc908043 Revert "Update felix SVN to 21"
This reverts commit 29203a354d.

Reason for revert: b/289414927
Bug: 289414927
Change-Id: I37230a6d768bd2293b7c9fb4bf9659b9a31f5ae8
2023-08-02 02:22:17 +00:00
Shawn Lin
b72effb056 Fix layout issue of pattern set up page in F10 am: 84485a4bde am: 28ea5128bf
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24257623

Change-Id: Iddf84ce6206643b415908dc804e9819af9072717
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-31 19:57:42 +00:00
Shawn Lin
77aa888c49 Fix layout issue of pattern set up page in F10 am: 84485a4bde am: 96bb429635
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24257623

Change-Id: Ic21590be1ef2a2547ec6e8fa915aff63f6960382
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-31 19:54:36 +00:00
Shawn Lin
28ea5128bf Fix layout issue of pattern set up page in F10 am: 84485a4bde
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24257623

Change-Id: Iedb1bc1581a521deee3b09524fa45b9915d71af9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-31 19:11:58 +00:00