google-gs201/android_device_google_lynx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,831 Commits 2 Branches 0 Tags
9c5eb74219af3c2203b57c09f5e66dd1c9c70943
Commit Graph

1831 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
d6ddf5dc46 [automerger skipped] Fix lunch choices for git_main am: 644a59b607 am: 3d2670dcaa -s ours 
am skip reason: Merged-In I7b31c905be1d994de52652162c0bd2bc8c5b8c65 with SHA-1 644a59b607 is already in history

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

Change-Id: I5599c13ed56dcc8a68c96b351c96f2f41fcf5b5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-31 00:06:07 +00:00
Greg Kaiser
3d2670dcaa Fix lunch choices for git_main am: 644a59b607 
Original change: https://android-review.googlesource.com/c/device/google/lynx/+/2811080

Change-Id: I24131673d1b67e98b9f23382dd4bd8b3bcf364c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-30 23:40:32 +00:00
Greg Kaiser
5bc21fedf4 Fix lunch choices for git_main am: 644a59b607 am: 5be906235d 
Original change: https://android-review.googlesource.com/c/device/google/lynx/+/2811080

Change-Id: I61137e25ffc32994d14d637d245590ae535acf0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-30 23:37:01 +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
Android Build Coastguard Worker
cb80a8abca Merge cherrypicks of ['googleplex-android-review.googlesource.com/25177037', 'googleplex-android-review.googlesource.com/25062409', 'googleplex-android-review.googlesource.com/25169439'] into udc-qpr1-release. 
Change-Id: I492f9f5c26e65a139a632dd3c9aef9bbdd82e121
 2023-10-27 03:36:10 +00:00
Ankur Bakshi
9bd629d062 Update lynx SVN to 22 
Bug: 302612466
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:126e54a429eadbc2b63370aca5f1908b5f74a55a)
Merged-In: Ib3ccc703aba169eba719121c42cbc248d7d5d477
Change-Id: Ib3ccc703aba169eba719121c42cbc248d7d5d477
 2023-10-27 03:32:28 +00:00
Shivakumar Neginal
c7a230f565 Adding Fast Pair extended IDs for L10 
Adding the Fast Pair extended IDs for lynx so that
    Quick Start shows the right Fast Pair bottom sheet on other devices
    during setup.

    Bug: 305516133
    Test: TBD
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:738a0e9359bdc221c4a223873cff53cb13e8e34f)
Merged-In: I3d4492e007de0b25f6f4af37917e798861d48a77
Change-Id: I3d4492e007de0b25f6f4af37917e798861d48a77
 2023-10-27 03:32:20 +00:00
Lokesh Kumar Goel
b1dd19f400 Update lynx SVN to 21 
Bug: 302612466
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:02c0ddcf511b8177fcef205a9c030976c76ef260)
Merged-In: Id418cfb0934077258b796552b0ff376ca8dde30e
Change-Id: Id418cfb0934077258b796552b0ff376ca8dde30e
 2023-10-27 03:32:10 +00:00
Ankur Bakshi
353e5aa3a7 Update lynx SVN to 22 am: 126e54a429 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/25169439

Change-Id: Icc117408f8cf8de2844a0d95a91ef18b71e432dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-27 02:47:03 +00:00
Ankur Bakshi
126e54a429 Update lynx SVN to 22 
Bug: 302612466
Change-Id: Ib3ccc703aba169eba719121c42cbc248d7d5d477
 2023-10-27 02:14:02 +00:00