Commit Graph

1843 Commits

Author SHA1 Message Date
Becker (Chan-Ying) Lien
46c7dfa0c9 Update ShannonIms CERTIFICATE to PRESIGNED for Lynx
This is a reland of 7f719af997 which gets
lost in ag/25428572

Bug: 311289519
Change-Id: If9a1551e1e9f7c43b50881e180b91eb424ed2ec1
2024-01-11 15:57:56 -08:00
Ankur Bakshi
64af3ff11a Update lynx SVN to 30 am: 3ce29f02a2
Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/25835522

Change-Id: Ic797ec53508c1121b5f08dc57b2af7a70539d692
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-10 05:50:36 +00:00
Ankur Bakshi
3ce29f02a2 Update lynx SVN to 30
Bug: 313797924
Change-Id: I1f2a52bd66a1c93e18af3b92d54d3e26975b408a
(cherry picked from commit 6885ce3b99)
Merged-In: I1f2a52bd66a1c93e18af3b92d54d3e26975b408a
2024-01-09 02:46:03 +00:00
Xin Li
d51dcf7084 Remove PixelQualifiedNetworksService for AOSP builds.
Bug: 309712809
Test: https://android-build.corp.google.com/builds/abtd/run/L26400030001089366
Change-Id: I448be8c8e411d1af6e7190d6e0676d4c73a91610
2024-01-04 09:38:50 -08:00
Ankur Bakshi
86c13cca61 Update lynx SVN to 29 am: 43b7102690
Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/25620197

Change-Id: I9f27a966f4d9e649f8c622eef0fa99a2b25f0afa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-12 15:59:02 +00:00
Ankur Bakshi
d2b531ce32 Update lynx SVN to 28 am: 8fd9608286
Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/25617919

Change-Id: If72eb0e454f19569c2fe56b84360b257759c1599
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-12 00:14:16 +00:00
Ankur Bakshi
43b7102690 Update lynx SVN to 29
Bug: 313797924
Change-Id: I2c42209ecd64e0c6ec73bbb2e795756281a635f2
2023-12-11 23:49:36 +00:00
Treehugger Robot
2dcb9f8e04 Merge "Revert^2 "lynx(nfc): Modify NFC overlays for NFC apex"" into main am: aadca75653 am: 8e993b8f68
Original change: https://android-review.googlesource.com/c/device/google/lynx/+/2864192

Change-Id: I68808608192e87389afd37c8ef95ba868bf5114e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 22:40:10 +00:00
Treehugger Robot
9c5eb74219 Merge "Revert^2 "lynx: Replace NFC app with NFC apex"" into main am: b0ce4242e1 am: 22ea4bbc32
Original change: https://android-review.googlesource.com/c/device/google/lynx/+/2863447

Change-Id: I4d4da02ac2aeb08cac14abe7b5a28b984b370af0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 22:40:02 +00:00
Treehugger Robot
8e993b8f68 Merge "Revert^2 "lynx(nfc): Modify NFC overlays for NFC apex"" into main am: aadca75653
Original change: https://android-review.googlesource.com/c/device/google/lynx/+/2864192

Change-Id: I16a26d176ade015d41beb9b8df20595761f54b82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 22:18:18 +00:00
Treehugger Robot
22ea4bbc32 Merge "Revert^2 "lynx: Replace NFC app with NFC apex"" into main am: b0ce4242e1
Original change: https://android-review.googlesource.com/c/device/google/lynx/+/2863447

Change-Id: I50b43c996fd362a8b5bc20ecfb61059105f8ff4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 22:18:08 +00:00
Xin Li
89cd47ec67 [automerger skipped] Merge Android 14 QPR1 am: dc75d8a2bc -s ours am: 5ef08bea0b -s ours
am skip reason: Merged-In I47cd9c92e39ae43730b1195379235913300a49c0 with SHA-1 b4d0e7c821 is already in history

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

Change-Id: I380a1589137daf89dfef13c327c4609e6fd67e5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 22:02:20 +00:00
Treehugger Robot
aadca75653 Merge "Revert^2 "lynx(nfc): Modify NFC overlays for NFC apex"" into main 2023-12-11 22:00:35 +00:00
Treehugger Robot
b0ce4242e1 Merge "Revert^2 "lynx: Replace NFC app with NFC apex"" into main 2023-12-11 22:00:35 +00:00
Xin Li
5ef08bea0b [automerger skipped] Merge Android 14 QPR1 am: dc75d8a2bc -s ours
am skip reason: Merged-In I47cd9c92e39ae43730b1195379235913300a49c0 with SHA-1 b4d0e7c821 is already in history

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

Change-Id: I66c1ccd2f84d4f28cae2ca7275cdabd809016465
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11 21:16:31 +00:00
Ankur Bakshi
8fd9608286 Update lynx SVN to 28
Bug: 313797924
Change-Id: I1b62f6f6e86128428f8855641d334a87ff90e587
2023-12-11 20:10:56 +00:00
Xin Li
dc75d8a2bc Merge Android 14 QPR1
Merged-In: I47cd9c92e39ae43730b1195379235913300a49c0
Bug: 315507370
Change-Id: I239c08edf0a2f6479836a2f4a46ea3fc83d3be2d
2023-12-08 13:13:24 -08:00
Xin Li
959e34508f [automerger skipped] Merge UQ1A.231205.015 am: b4d0e7c821 -s ours
am skip reason: Merged-In Ib3ccc703aba169eba719121c42cbc248d7d5d477 with SHA-1 126e54a429 is already in history

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

Change-Id: Ic93190554a543045fe9c00ac7a78fd1b2e90b6c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08 08:21:14 +00:00
Xin Li
b4d0e7c821 Merge UQ1A.231205.015
Bug: 308969284
Merged-In: Ib3ccc703aba169eba719121c42cbc248d7d5d477
Change-Id: I47cd9c92e39ae43730b1195379235913300a49c0
2023-12-07 15:47:12 -08:00
Roshan Pius
1ce3efae16 Revert^2 "lynx(nfc): Modify NFC overlays for NFC apex"
b8729b4c8c

Bug: 303286040
Test: Compiles
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:1d9b0c8f2664145ee69894624f5223a7ee6c8bee)
Merged-In: I8078db2061a83f4ebac2e46c1cec96e3c363b225
Change-Id: I8078db2061a83f4ebac2e46c1cec96e3c363b225

Change-Id: I46ba4495364a794d87817c2fac9f4f974fc8ea21
2023-12-07 10:25:04 -08:00
Roshan Pius
badff325eb Revert^2 "lynx: Replace NFC app with NFC apex"
b1df779431

Bug: 303286040
Test: Compiles
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ecb5502fcdcc26a1fedd776c0b368357acf6c615)
Merged-In: I9ae126ca8228c293bb7a88bed645528db3e0642b
Change-Id: I9ae126ca8228c293bb7a88bed645528db3e0642b
2023-12-06 21:31:40 +00:00
Ankur Bakshi
7270ac9658 Update lynx SVN to 27 am: f364e86d29
Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/25497757

Change-Id: If8af85fa8961cc24777b378fe61e726d4f36cd87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 22:35:03 +00:00
Ankur Bakshi
a2a173c220 Update lynx SVN to 26 am: bcbc47f9b6
Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/25499378

Change-Id: I5b2f4a2963e0915a20a681217efdfc8a4a3febd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 22:34:59 +00:00
Ankur Bakshi
f364e86d29 Update lynx SVN to 27
Bug: 313696499
Change-Id: I62ae585f1fdf41f58c1d0db85cd445afe37eae7a
2023-11-29 06:33:47 +00:00
Ankur Bakshi
bcbc47f9b6 Update lynx SVN to 26
Bug: 313696499
Change-Id: I59c0060571e481d7d79a25237e17ddc921e542bb
2023-11-29 06:31:07 +00:00
Treehugger Robot
54641559e3 Merge "[conflict] Remove unused Android.mk under device/google/lynx am: eaadd11df8 am: d8dda1f2ff" into udc-qpr-dev-plus-aosp 2023-11-21 03:25:30 +00:00
Herbert Xue
1ac9cb790f [conflict] Remove unused Android.mk under device/google/lynx am: eaadd11df8 am: 09d48f9094
Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/25422223

Change-Id: I2acfa557ec69a11d521ea5c972276e85c83d5817
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-21 02:43:50 +00:00
Herbert Xue
0c71c1897c [conflict] Remove unused Android.mk under device/google/lynx am: eaadd11df8 am: d8dda1f2ff
Original change: https://android-review.googlesource.com/c/device/google/lynx/+/2832603

Change-Id: I2b002464abdddb24c863fdc4793a3df6a448ad02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-21 02:17:30 +00:00
Herbert Xue
09d48f9094 [conflict] Remove unused Android.mk under device/google/lynx am: eaadd11df8
Original change: https://android-review.googlesource.com/c/device/google/lynx/+/2832603

Change-Id: I0d856e40ad6ab2ae698341d3110aefa6f83648c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-20 05:22:27 +00:00
Herbert Xue
d8dda1f2ff Remove unused Android.mk under device/google/lynx am: eaadd11df8
Original change: https://android-review.googlesource.com/c/device/google/lynx/+/2832603

Change-Id: I5054babc769d85275c31ff6dd45760812f3e68c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-20 03:23:52 +00:00
Ankur Bakshi
5270c3784b Update lynx SVN to 25 am: 24c5451e23
Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/25365436

Change-Id: Ib17f4f53a68959f488b5d6f425b6eaefefd9d5eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16 21:35:15 +00:00
Becker (Chan-Ying) Lien
f587c06637 Update ShannonIms CERTIFICATE to PRESIGNED for Lynx am: 8b07e4935a
Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/25398343

Change-Id: Ib0da96dcf1915466a5d4a96b8a98185d361e99f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16 19:15:41 +00:00
Becker (Chan-Ying) Lien
7f719af997 Update ShannonIms CERTIFICATE to PRESIGNED for Lynx
Bug: 311289519
Change-Id: I75460e4a840bb319b6a00442fde3f14f52f574d0
2023-11-16 17:52:42 +00:00
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
Herbert Xue
eaadd11df8 Remove unused Android.mk under device/google/lynx
Bug: 310087158
Test: NA
Change-Id: I1833c28cd1eade071a8ea6f66dacaa43a16de057
2023-11-16 15:24:14 +08:00
Ankur Bakshi
28bb8754fa Update lynx SVN to 24 am: 13f56384a8
Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/25343936

Change-Id: I21692a26f373dd46cdd2f06af186af621d9ebac9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-16 04:28:59 +00:00
Ankur Bakshi
24c5451e23 Update lynx SVN to 25
Bug: 309529736
Change-Id: I2c65f3c6a9488a96d3793ee505a3d91fd6ed1762
2023-11-14 03:58:32 +00:00
Ankur Bakshi
13f56384a8 Update lynx SVN to 24
Bug: 309529736
Change-Id: Id02da96e176692058b6075f35e29dcdda92e3367
2023-11-11 02:29:21 +00:00
Ankur Bakshi
f189a4f305 Update lynx SVN to 23 am: b7613b64d9
Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/25290512

Change-Id: Ia16c99456b9686bba033f5ea21176fd1fd590503
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-11 01:39:01 +00:00
Ankur Bakshi
b7613b64d9 Update lynx SVN to 23
Bug: 302612466
Change-Id: I06ff3d93eb0bfd675ad63d0b074f2c4a4da7ff21
2023-11-10 23:17:26 +00:00
Roshan Pius
381602ef91 [automerger skipped] Merge "Revert "lynx(nfc): Modify NFC overlays for NFC apex"" into main am: fe8604e7e8 am: 871731dc49 -s ours
am skip reason: Merged-In Icd19426cf13ab0b1092de4dc1abf79b850d04f3f with SHA-1 7cbe17540a is already in history

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

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

Change-Id: I2a9cbcfadfad6ce0332464e5485cf3cfab3a5cbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 22:48:38 +00:00
Roshan Pius
00e0f6e9de Merge "Revert "lynx(nfc): Modify NFC overlays for NFC apex"" into main am: fe8604e7e8 am: fed9aa059d
Original change: https://android-review.googlesource.com/c/device/google/lynx/+/2818132

Change-Id: I8068adb307add053812b7bf47c2b52f3541192cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 22:46:13 +00:00
Roshan Pius
51583737a9 Revert "lynx: Replace NFC app with NFC apex" am: 8562f5b786 am: 42136d32a0
Original change: https://android-review.googlesource.com/c/device/google/lynx/+/2816579

Change-Id: Ib85470e28c4057eb0535204c70be213d1d0d46e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 22:46:03 +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
fed9aa059d 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: Ife1e52bf2cab8b1f23686a446ca1c36747970a93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 21:45:29 +00:00
Roshan Pius
42136d32a0 Revert "lynx: Replace NFC app with NFC apex" am: 8562f5b786
Original change: https://android-review.googlesource.com/c/device/google/lynx/+/2816579

Change-Id: I8b11978d31e9e237858da4c2ab474537ea460dc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 21:45:23 +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