Commit Graph

1350 Commits

Author SHA1 Message Date
Becker (Chan-Ying) Lien
8b07e4935a Update ShannonIms CERTIFICATE to PRESIGNED for Lynx
Bug: 311289519
Change-Id: I75460e4a840bb319b6a00442fde3f14f52f574d0
2023-11-16 17:50:37 +00:00
Roshan Pius
871731dc49 Merge "Revert "lynx(nfc): Modify NFC overlays for NFC apex"" into main am: fe8604e7e8
Original change: https://android-review.googlesource.com/c/device/google/lynx/+/2818132

Change-Id: I885d6bc28cee9a099f0f65a4d571c78b0bc6e141
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 21:49:04 +00:00
Roshan Pius
bb3cb40239 Revert "lynx: Replace NFC app with NFC apex" am: 8562f5b786
Original change: https://android-review.googlesource.com/c/device/google/lynx/+/2816579

Change-Id: I9ea5e24a73b1a88a614fe24e5897160c012f526b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 21:48:51 +00:00
Roshan Pius
fe8604e7e8 Merge "Revert "lynx(nfc): Modify NFC overlays for NFC apex"" into main 2023-11-08 21:16:20 +00:00
Roshan Pius
7cbe17540a Revert "lynx(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: Icd19426cf13ab0b1092de4dc1abf79b850d04f3f
Change-Id: Icd19426cf13ab0b1092de4dc1abf79b850d04f3f
2023-11-06 19:45:37 +00:00
Roshan Pius
8562f5b786 Revert "lynx: 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:b1df77943111252c347eab44e1c55158384328aa)
Merged-In: If440c4bcad742af7c6d597eac9e45ce4d56453a4
Change-Id: If440c4bcad742af7c6d597eac9e45ce4d56453a4
2023-11-06 19:36:28 +00:00
Greg Kaiser
5be906235d Fix lunch choices for git_main am: 644a59b607
Original change: https://android-review.googlesource.com/c/device/google/lynx/+/2811080

Change-Id: I344c3d50321d501266becdb7c675f2f2da3df587
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-30 23:10:34 +00:00
Greg Kaiser
644a59b607 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:ae5df6c5a3228f450189be167ef1203477db950b)
Merged-In: I7b31c905be1d994de52652162c0bd2bc8c5b8c65
Change-Id: I7b31c905be1d994de52652162c0bd2bc8c5b8c65
2023-10-30 22:00:38 +00:00
Lokesh Kumar Goel
733d6eea60 Update lynx SVN to 21 am: 02c0ddcf51
Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/25177037

Change-Id: Ic2d5585a0f11c635be6feeb50473ccda1d68dc9e
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
ad27cbca2a Update lynx SVN to 20 am: 3a0d94f0d0
Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/25176539

Change-Id: Ifbe81425480586d863212d9b7d3d5a230364a834
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 19:03:26 +00:00
Roshan Pius
6caf249d3c lynx(nfc): Modify NFC overlays for NFC apex am: e952e3165a
Original change: https://android-review.googlesource.com/c/device/google/lynx/+/2803075

Change-Id: Ia135513080f5eab05af8f0941d1b45f614b294c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 14:35:52 +00:00
Roshan Pius
e952e3165a lynx(nfc): Modify NFC overlays for NFC apex
Bug: 307763519
Test: Manual flash and tested the overlay values are taking effect.
Change-Id: Iba38290fa7ef97d578036a140138c07a6c080aa3
2023-10-26 04:10:19 +00:00
Lokesh Kumar Goel
02c0ddcf51 Update lynx SVN to 21
Bug: 302612466
Change-Id: Id418cfb0934077258b796552b0ff376ca8dde30e
2023-10-25 20:27:51 +00:00
Lokesh Kumar Goel
3a0d94f0d0 Update lynx SVN to 20
Bug: 302612466
Change-Id: I3929cc8f47075a22d47c580a1ebc3acdef5ee589
2023-10-25 19:47:19 +00:00
Roshan Pius
399ffed584 Merge "lynx: Replace NFC app with NFC apex" into main am: 86e259c1c0 am: e22afc3211
Original change: https://android-review.googlesource.com/c/device/google/lynx/+/2779827

Change-Id: Ic06d1207cbb9554a0cef163bbb02d7b33533f911
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-16 19:38:17 +00:00
Roshan Pius
e22afc3211 Merge "lynx: Replace NFC app with NFC apex" into main am: 86e259c1c0
Original change: https://android-review.googlesource.com/c/device/google/lynx/+/2779827

Change-Id: I09a2476d33171162855086aac4f9545bce4eb7d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-16 19:15:54 +00:00
Roshan Pius
86e259c1c0 Merge "lynx: Replace NFC app with NFC apex" into main 2023-10-16 18:31:03 +00:00
Roshan Pius
22ea3c2b4e lynx: Replace NFC app with NFC apex
Bug: 303286040
Test: Compiles
Merged-In: Id85d62a10589765dffa293770bca9d0906eb2973
Change-Id: Id85d62a10589765dffa293770bca9d0906eb2973
2023-10-13 18:05:28 +00:00
Xin Li
cfdbe750ee [automerger skipped] Merge Android 14 am: 4587235724 -s ours am: 60247ee0cb -s ours
am skip reason: Merged-In Iffadfd1f436b5ce27c2332a68f6d8d7c5b76507e with SHA-1 f34a869306 is already in history

Original change: https://android-review.googlesource.com/c/device/google/lynx/+/2776402

Change-Id: Ib7766173776561b2f435a55b637d80a428935cb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 08:58:43 +00:00
Xin Li
60247ee0cb [automerger skipped] Merge Android 14 am: 4587235724 -s ours
am skip reason: Merged-In Iffadfd1f436b5ce27c2332a68f6d8d7c5b76507e with SHA-1 f34a869306 is already in history

Original change: https://android-review.googlesource.com/c/device/google/lynx/+/2776402

Change-Id: Ibca60d516795ac9d468ce11621d1c9ac186d7deb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 07:51:41 +00:00
Xin Li
4587235724 Merge Android 14
Bug: 298295554
Merged-In: Iffadfd1f436b5ce27c2332a68f6d8d7c5b76507e
Change-Id: I9c3c689e4ccc3d156a50452ceeed2801cdf68254
2023-10-05 15:33:42 -07:00
Xin Li
183e4ee15e [automerger skipped] Merge UP1A.231005.007 am: 682a3bd546 -s ours
am skip reason: Merged-In Iffadfd1f436b5ce27c2332a68f6d8d7c5b76507e with SHA-1 75f1a483a6 is already in history

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

Change-Id: I33082f08959ff037e455e386fae894ef2a53c380
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-29 07:15:38 +00:00
Xin Li
682a3bd546 Merge UP1A.231005.007
Bug: 291102124
Merged-In: Iffadfd1f436b5ce27c2332a68f6d8d7c5b76507e
Change-Id: If0cb0cf81edabfd491128f6fe95f39e2678397ff
2023-09-27 16:04:23 -07:00
Ankur Bakshi
746df61329 Update lynx SVN to 19 am: 2b2fdad817
Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/24699139

Change-Id: I9183e8a04c9d50afb8625b7141af79cf714490c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 18:51:18 +00:00
Ankur Bakshi
0ba105017e Update lynx SVN to 18 am: 9909067723
Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/24687081

Change-Id: I9d22503d3178dec3fecc2679a04d7da80fc8e55c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 18:51:16 +00:00
Ankur Bakshi
2b2fdad817 Update lynx SVN to 19
Bug: 298087649
Change-Id: I370515ae8b4f972059a8af4625dc55a052bb7348
2023-09-08 01:29:57 +00:00
Ankur Bakshi
9909067723 Update lynx SVN to 18
Bug: 298087649
Change-Id: Iadd6e0f8767cc8acfa0040b43190b3f2b35320de
2023-09-07 05:15:57 +00:00
Xin Li
6fb6425739 [automerger skipped] Merge UP1A.230905.019 am: 0ea3181c68 -s ours
am skip reason: Merged-In I8981f42c3b0b8ba9e5246c0aaedaafc5d7bfe71a with SHA-1 298ba980a2 is already in history

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

Change-Id: I8e9fd6f8959079f2a0747933881d59e3e555b044
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-05 19:45:20 +00:00
Xin Li
0ea3181c68 Merge UP1A.230905.019
Merged-In: I8981f42c3b0b8ba9e5246c0aaedaafc5d7bfe71a
Change-Id: If1749b939311c7fc68e40a3ef783afaf19a49f9d
2023-08-31 12:16:21 -07:00
Android Build Coastguard Worker
03fb5d8f95 [coastguard skipped] Merge sparse cherrypicks from sparse-10740638-L17800000962853027 into udc-release.
COASTGUARD_SKIP: Ief4eef8046b44c07f285bdf4ad4b9ffdd0e8d5fc
COASTGUARD_SKIP: Iffadfd1f436b5ce27c2332a68f6d8d7c5b76507e

Change-Id: I77002331c8429dad362325978e66378a1969d2c3
2023-08-30 23:17:06 +00:00
Android Build Coastguard Worker
311a1c7b9d Merge cherrypicks of ['googleplex-android-review.googlesource.com/24436879'] into sparse-10740638-L17800000962853027.
SPARSE_CHANGE: Iffadfd1f436b5ce27c2332a68f6d8d7c5b76507e

Change-Id: Ief4eef8046b44c07f285bdf4ad4b9ffdd0e8d5fc
2023-08-30 23:10:25 +00:00
Lokesh Kumar Goel
f34a869306 Update lynx SVN to 17
Bug: 295937899
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:75f1a483a673e7946fdeda74700feb74a771669e)
Merged-In: Iffadfd1f436b5ce27c2332a68f6d8d7c5b76507e
Change-Id: Iffadfd1f436b5ce27c2332a68f6d8d7c5b76507e
2023-08-30 23:08:40 +00:00
Android Build Coastguard Worker
3ea2975813 [coastguard skipped] Merge sparse cherrypicks from sparse-10739010-L93800000962847818 into udc-release.
COASTGUARD_SKIP: Iffadfd1f436b5ce27c2332a68f6d8d7c5b76507e
COASTGUARD_SKIP: I66a4ee4a70bd094c19276656b4a888d44800f1d2

Change-Id: I94871f92c9785cf89903b0e27218e1745f0b70e9
2023-08-30 18:57:34 +00:00
Android Build Coastguard Worker
659adedcf9 Merge cherrypicks of ['googleplex-android-review.googlesource.com/24436879'] into sparse-10739010-L93800000962847818.
SPARSE_CHANGE: Iffadfd1f436b5ce27c2332a68f6d8d7c5b76507e

Change-Id: I66a4ee4a70bd094c19276656b4a888d44800f1d2
2023-08-30 18:50:49 +00:00
Lokesh Kumar Goel
bff662971b Update lynx SVN to 17
Bug: 295937899
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:75f1a483a673e7946fdeda74700feb74a771669e)
Merged-In: Iffadfd1f436b5ce27c2332a68f6d8d7c5b76507e
Change-Id: Iffadfd1f436b5ce27c2332a68f6d8d7c5b76507e
2023-08-30 18:48:49 +00:00
Treehugger Robot
571ccf7054 Merge "Add aosp_lynx_hwasan" into main am: 0b5d4d46e5 am: bb37ea6bc8
Original change: https://android-review.googlesource.com/c/device/google/lynx/+/2729356

Change-Id: I3a8151092c91d7ef2bf7670dddd94851a48a6c38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 00:28:01 +00:00
Xin Li
639c581144 [automerger skipped] Merge Android U (ab/10368041) am: 166f497a25 -s ours
am skip reason: Merged-In I9b1a81a02662ec49f24235f995c1503f60a5b492 with SHA-1 1402f63109 is already in history

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

Change-Id: I6453748db5d3df4e14049283d661238d5f1af476
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28 23:58:49 +00:00
Treehugger Robot
bb37ea6bc8 Merge "Add aosp_lynx_hwasan" into main am: 0b5d4d46e5
Original change: https://android-review.googlesource.com/c/device/google/lynx/+/2729356

Change-Id: Ie4b1fff5fc00861b0a8d728fb8f7b5c5fa6ca8d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28 22:53:37 +00:00
Treehugger Robot
0b5d4d46e5 Merge "Add aosp_lynx_hwasan" into main 2023-08-28 21:23:28 +00:00
Florian Mayer
2c87b60f23 Add aosp_lynx_hwasan
Bug: 297918380
Change-Id: I0dfd9d498a0a989355ca76d561fa267d41e1cd3b
2023-08-28 13:11:18 -07:00
Android Build Coastguard Worker
a6d19ce5be [coastguard skipped] Merge sparse cherrypicks from sparse-10705648-L70200000962736881 into udc-release.
COASTGUARD_SKIP: I6a80d52712b561d866f67066ccbf54286a350e24
COASTGUARD_SKIP: Iffadfd1f436b5ce27c2332a68f6d8d7c5b76507e

Change-Id: I7cf8726b03467a7a33933df4e7275efc61925007
2023-08-23 23:45:51 +00:00
Android Build Coastguard Worker
be35192482 Merge cherrypicks of ['googleplex-android-review.googlesource.com/24436879'] into sparse-10705648-L70200000962736881.
SPARSE_CHANGE: Iffadfd1f436b5ce27c2332a68f6d8d7c5b76507e

Change-Id: I6a80d52712b561d866f67066ccbf54286a350e24
2023-08-23 23:40:41 +00:00
Lokesh Kumar Goel
e62accf521 Update lynx SVN to 17
Bug: 295937899
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:75f1a483a673e7946fdeda74700feb74a771669e)
Merged-In: Iffadfd1f436b5ce27c2332a68f6d8d7c5b76507e
Change-Id: Iffadfd1f436b5ce27c2332a68f6d8d7c5b76507e
2023-08-23 23:39:10 +00:00
Android Build Coastguard Worker
5714496e8f [coastguard skipped] Merge sparse cherrypicks from sparse-10696112-L14300000962710292 into udc-release.
COASTGUARD_SKIP: I701b59642efa871f8902794ccc6ac865b1a829ea
COASTGUARD_SKIP: Iffadfd1f436b5ce27c2332a68f6d8d7c5b76507e

Change-Id: I939968a84909761642b77cc8c747f2010821b6ae
2023-08-22 21:17:11 +00:00
Android Build Coastguard Worker
2266c2d625 Merge cherrypicks of ['googleplex-android-review.googlesource.com/24436879'] into sparse-10696112-L14300000962710292.
SPARSE_CHANGE: Iffadfd1f436b5ce27c2332a68f6d8d7c5b76507e

Change-Id: I701b59642efa871f8902794ccc6ac865b1a829ea
2023-08-22 21:11:21 +00:00
Lokesh Kumar Goel
9f9b5e4b40 Update lynx SVN to 17
Bug: 295937899
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:75f1a483a673e7946fdeda74700feb74a771669e)
Merged-In: Iffadfd1f436b5ce27c2332a68f6d8d7c5b76507e
Change-Id: Iffadfd1f436b5ce27c2332a68f6d8d7c5b76507e
2023-08-22 21:09:38 +00:00
Android Build Coastguard Worker
84654460fb Merge cherrypicks of ['googleplex-android-review.googlesource.com/24392319', 'googleplex-android-review.googlesource.com/24425770', 'googleplex-android-review.googlesource.com/24210868'] into udc-release.
Change-Id: I5626f91945e628e2d2086d30ae6bae9db4267f3c
2023-08-22 02:18:57 +00:00
Edwin Tung
17bb9133e0 gps: Disable Vzw SUPL OTDOA
Bug: 293213801

Test: OTDOA disabled
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:7a3b1491fe6cf7d70a641d3f0e4fb7e7f816e22f)
Merged-In: If504f67da0640634ff30379a14af4e15f062fefa
Change-Id: If504f67da0640634ff30379a14af4e15f062fefa
2023-08-22 02:08:20 +00:00
Lokesh Kumar Goel
65490d791d Update lynx SVN to 16
Bug: 295937899
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:cd45a63aaffa3c0dc714b9d51d1727cca682dbc6)
Merged-In: Icb163819116e61292429a2c1c362d40649a6f7e8
Change-Id: Icb163819116e61292429a2c1c362d40649a6f7e8
2023-08-22 02:08:12 +00:00
Bassem Khalife
926a265425 Update lynx SVN to 15
Bug: 289414927
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:298ba980a2bfcc3b0628cee69670f2c3e35f626b)
Merged-In: I8981f42c3b0b8ba9e5246c0aaedaafc5d7bfe71a
Change-Id: I8981f42c3b0b8ba9e5246c0aaedaafc5d7bfe71a
2023-08-22 02:08:04 +00:00