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

1750 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Shivakumar Neginal
39dd01e133 Adding Fast Pair extended IDs for L10 am: 738a0e9359 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/25062409

Change-Id: I73be983690c8ae862f5b7b098b4de8cf3f8e770d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-26 23:21:06 +00:00
Shivakumar Neginal
738a0e9359 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

Change-Id: I3d4492e007de0b25f6f4af37917e798861d48a77
 2023-10-26 22:56:17 +00:00
Lokesh Kumar Goel
47a93eb2f9 Update lynx SVN to 21 am: 02c0ddcf51 am: 48c0187392 am: 6718e150c6 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/25177037

Change-Id: Icea1208819e813b1b875e8200a79750c01de6e97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-26 21:55:29 +00:00
Lokesh Kumar Goel
22bc688138 [automerger skipped] Update lynx SVN to 20 am: 3a0d94f0d0 am: cc5f316bba -s ours am: 20b24e4102 -s ours 
am skip reason: skipped by user lokeshgoel

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

Change-Id: I08bd2b0d773f5c700abfe3bf0672802f72dca6e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-26 21:54:57 +00:00
Lokesh Kumar Goel
eda7403e0f Update lynx SVN to 21 am: 02c0ddcf51 am: 733d6eea60 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/25177037

Change-Id: I8f5ba1955b905bcd8a4e45eb7ad2d0697c77e842
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-26 21:33:14 +00:00
Lokesh Kumar Goel
2f3237009e [automerger skipped] Update lynx SVN to 20 am: 3a0d94f0d0 am: ad27cbca2a -s ours 
am skip reason: skipped by user lokeshgoel

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

Change-Id: I5242ac643583f78447a9195c92b054a96b1c5526
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-26 21:32:35 +00:00
Lokesh Kumar Goel
6718e150c6 Update lynx SVN to 21 am: 02c0ddcf51 am: 48c0187392 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/25177037

Change-Id: I60ea6e9255f69a3c6ae81f346f420112f1bf326f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-26 21:24:39 +00:00
Lokesh Kumar Goel
20b24e4102 [automerger skipped] Update lynx SVN to 20 am: 3a0d94f0d0 am: cc5f316bba -s ours 
am skip reason: skipped by user lokeshgoel

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

Change-Id: I58aa7eb4ea9059989689f05b4a037710b89a802e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-26 21:24:00 +00:00
Lokesh Kumar Goel
48c0187392 Update lynx SVN to 21 am: 02c0ddcf51 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/25177037

Change-Id: I84247c4df52aac001c6ad435a926cdcba2fc6dfd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-26 19:06:23 +00:00
Lokesh Kumar Goel
cc5f316bba Update lynx SVN to 20 am: 3a0d94f0d0 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/25176539

Change-Id: I48fbfe69521e9af72e2797f17683b658b7a4ea2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-26 19:05:57 +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
6592067ee9 lynx(nfc): Modify NFC overlays for NFC apex am: e952e3165a am: 6caf249d3c 
Original change: https://android-review.googlesource.com/c/device/google/lynx/+/2803075

Change-Id: I1cbc86979dcd8296d1a7ba231693a608f1eb7a71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-26 14:58:35 +00:00
Roshan Pius
8cbfc13251 lynx(nfc): Modify NFC overlays for NFC apex am: e952e3165a am: 2ca631c421 
Original change: https://android-review.googlesource.com/c/device/google/lynx/+/2803075

Change-Id: Ic5a7be8e2786581c8531836211137aa4b3592433
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-26 14:57:08 +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
2ca631c421 lynx(nfc): Modify NFC overlays for NFC apex am: e952e3165a 
Original change: https://android-review.googlesource.com/c/device/google/lynx/+/2803075

Change-Id: I7a621137f0d51d50d2d4d7580e63168f01ba5229
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-26 14:33:56 +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
80556bb306 Update lynx SVN to 21 am: 86a5650a25 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/24896514

Change-Id: I510fe990485c54216b3c9c191ef9b48814418930
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-25 20:42:46 +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
Xin Li
26f2eb1d3e [automerger skipped] Merge 10952656 am: 2752cdf1ab -s ours 
am skip reason: Merged-In I11c4c8b1b9097b540e94f7afaa57442b6d303efa with SHA-1 e5ea29deb0 is already in history

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

Change-Id: I64e77948f21c7d3553a6b0ce4bcea8113af3c8f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-19 18:47:47 +00:00
Xin Li
2752cdf1ab Merge 10952656 
Merged-In: I11c4c8b1b9097b540e94f7afaa57442b6d303efa
Change-Id: Iffa8b485b4eb0c28824fea1326a3e73a49552fd1
 2023-10-17 10:06:30 -07:00
Roshan Pius
8b5cbe97a1 Merge "lynx: Replace NFC app with NFC apex" into main am: 86e259c1c0 am: e22afc3211 am: 399ffed584 am: efb33b30b4 
Original change: https://android-review.googlesource.com/c/device/google/lynx/+/2779827

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

Change-Id: I64548363121ba4373f0cd8c3294e8646984cf432
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-16 20:13:08 +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
Lokesh Kumar Goel
8627a82843 Update lynx SVN to 20 am: 771547b88e 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/24896429

Change-Id: Ia9f87ec303f00457d0647452dd59ac8e9215f987
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-16 05:04:25 +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
e5ea29deb0 [automerger skipped] Merge Android 14 am: 4587235724 -s ours am: 60247ee0cb -s ours am: cfdbe750ee -s ours am: b1b596fc63 -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: I11c4c8b1b9097b540e94f7afaa57442b6d303efa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-06 11:00:12 +00:00
Xin Li
b1b596fc63 [automerger skipped] Merge Android 14 am: 4587235724 -s ours am: 60247ee0cb -s ours am: cfdbe750ee -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: Ie42d5c503fdd0bd50c715ab2c2147fc5e5f41f29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-06 09:50:22 +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