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

1314 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
4587235724 Merge Android 14 
Bug: 298295554
Merged-In: Iffadfd1f436b5ce27c2332a68f6d8d7c5b76507e
Change-Id: I9c3c689e4ccc3d156a50452ceeed2801cdf68254
 2023-10-05 15:33:42 -07:00
Xin Li
682a3bd546 Merge UP1A.231005.007 
Bug: 291102124
Merged-In: Iffadfd1f436b5ce27c2332a68f6d8d7c5b76507e
Change-Id: If0cb0cf81edabfd491128f6fe95f39e2678397ff
 2023-09-27 16:04:23 -07: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
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
Android Build Coastguard Worker
f635e5e221 [coastguard skipped] Merge sparse cherrypicks from sparse-10685236-L11100000962655815 into udc-release. 
COASTGUARD_SKIP: I8981f42c3b0b8ba9e5246c0aaedaafc5d7bfe71a
COASTGUARD_SKIP: I4bfef11aa61c92539304ecbf3c8acece9189aa6c

Change-Id: I7073a0d6514187ddf91b8eb73a2f32eb82ea3d0f
 2023-08-20 07:53:15 +00:00
Android Build Coastguard Worker
0d0b7492e9 Merge cherrypicks of ['googleplex-android-review.googlesource.com/24392319'] into sparse-10685236-L11100000962655815. 
SPARSE_CHANGE: I8981f42c3b0b8ba9e5246c0aaedaafc5d7bfe71a

Change-Id: I4bfef11aa61c92539304ecbf3c8acece9189aa6c
 2023-08-20 07:45:15 +00:00
Bassem Khalife
1f4d52a4ab 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-20 07:44:30 +00:00
Xin Li
166f497a25 Merge Android U (ab/10368041) 
Bug: 291102124
Merged-In: I9b1a81a02662ec49f24235f995c1503f60a5b492
Change-Id: I9b52ee4b5f68c878405d3d62f73726a9daaf9895
 2023-08-14 15:33:44 -07:00
Android Build Coastguard Worker
c11b50f301 [coastguard skipped] Merge sparse cherrypicks from sparse-10656238-L15800000962566969 into udc-release. 
COASTGUARD_SKIP: I8981f42c3b0b8ba9e5246c0aaedaafc5d7bfe71a
COASTGUARD_SKIP: I6a7ba03179eb532071d73434fe87edd4c339ae9b

Change-Id: Iae07e0e003e4a81a6dc187bfcff832f3dba77184
 2023-08-14 21:47:07 +00:00
Android Build Coastguard Worker
8d430157dc Merge cherrypicks of ['googleplex-android-review.googlesource.com/24392319'] into sparse-10656238-L15800000962566969. 
SPARSE_CHANGE: I8981f42c3b0b8ba9e5246c0aaedaafc5d7bfe71a

Change-Id: I6a7ba03179eb532071d73434fe87edd4c339ae9b
 2023-08-14 21:43:01 +00:00
Bassem Khalife
a09cd830e1 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-14 21:41:41 +00:00
Android Build Coastguard Worker
5c94286b4a Merge cherrypicks of ['googleplex-android-review.googlesource.com/24336140', 'googleplex-android-review.googlesource.com/24373027'] into udc-release. 
Change-Id: I620f2a98e1d6b4bec7ed5d54c4f87efda3ef7fc9
 2023-08-14 19:53:06 +00:00
Bassem Khalife
c632b34045 Update lynx SVN to 14 
Bug: 289414927
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:fcb876920cd88f13dd3232f8226e48fda15189c2)
Merged-In: Id791daa1eb536dbc913662b5ce143c617eab92f1
Change-Id: Id791daa1eb536dbc913662b5ce143c617eab92f1
 2023-08-14 19:51:43 +00:00
Bassem Khalife
8713880edf Update lynx SVN to 13 
Bug: 289414927
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:6f660f6b03225acdfd9774549d9ab6102ca14028)
Merged-In: I237e43527c64121f830753e113c26dbab51ff47a
Change-Id: I237e43527c64121f830753e113c26dbab51ff47a
 2023-08-14 19:51:33 +00:00
Android Build Coastguard Worker
90db624827 [coastguard skipped] Merge sparse cherrypicks from sparse-10644925-L97000000962543233 into udc-release. 
COASTGUARD_SKIP: Id0aa5e8bd7597d2cb3f460f5bfec112890225e8f
COASTGUARD_SKIP: I237e43527c64121f830753e113c26dbab51ff47a

Change-Id: Ida45b9ba674b3a445721002835c3cf84e9958311
 2023-08-11 23:57:40 +00:00
Android Build Coastguard Worker
c95090c56c Merge cherrypicks of ['googleplex-android-review.googlesource.com/24336140'] into sparse-10644925-L97000000962543233. 
SPARSE_CHANGE: I237e43527c64121f830753e113c26dbab51ff47a

Change-Id: Id0aa5e8bd7597d2cb3f460f5bfec112890225e8f
 2023-08-11 23:53:17 +00:00
Bassem Khalife
2fba189428 Update lynx SVN to 13 
Bug: 289414927
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:6f660f6b03225acdfd9774549d9ab6102ca14028)
Merged-In: I237e43527c64121f830753e113c26dbab51ff47a
Change-Id: I237e43527c64121f830753e113c26dbab51ff47a
 2023-08-11 23:52:44 +00:00
Android Build Coastguard Worker
217b53e007 [coastguard skipped] Merge sparse cherrypicks from sparse-10615966-L19700000962413635 into udc-release. 
COASTGUARD_SKIP: I184c20dd6fd388f8abc430e14825f2489f41c1b9
COASTGUARD_SKIP: I237e43527c64121f830753e113c26dbab51ff47a

Change-Id: I0ca21b2bf9b562bef74ee2e7351ea1cc419e5c8c
 2023-08-06 22:15:42 +00:00
Android Build Coastguard Worker
4500558a29 Merge cherrypicks of ['googleplex-android-review.googlesource.com/24336140'] into sparse-10615966-L19700000962413635. 
SPARSE_CHANGE: I237e43527c64121f830753e113c26dbab51ff47a

Change-Id: I184c20dd6fd388f8abc430e14825f2489f41c1b9
 2023-08-06 22:11:18 +00:00
Bassem Khalife
6f4f9bf95e Update lynx SVN to 13 
Bug: 289414927
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:6f660f6b03225acdfd9774549d9ab6102ca14028)
Merged-In: I237e43527c64121f830753e113c26dbab51ff47a
Change-Id: I237e43527c64121f830753e113c26dbab51ff47a
 2023-08-06 22:10:56 +00:00
Bill Yi
1133ffb432 [automerger skipped] Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE am: 1640f70b7b -s ours 
am skip reason: Merged-In Ia64f2d51c46a36bbcb2547d4077d4027d0c65985 with SHA-1 504f8cc5a1 is already in history

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

Change-Id: I929015eb9f3ec92e6d221c52db4adaa93faedba8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 14:10:24 +00:00
Bill Yi
1640f70b7b Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE 
Merged-In: Ia64f2d51c46a36bbcb2547d4077d4027d0c65985
Merged-In: I9c05d2f95790be4d69bcb0f02a811755bc7a8060
Merged-In: I1e567b8af7274ca6d08ab99c244a89bdea3f05e2
Change-Id: I81dc93928061c1beb77fa45c148748220d1fddd3
 2023-07-11 15:27:39 -07:00
Android Build Coastguard Worker
5942dbec6f Merge cherrypicks of ['googleplex-android-review.googlesource.com/23862648'] into udc-release. 
Change-Id: I8f1c6316e9c50767ec4674052cedf1f8f7eac0d9
 2023-06-30 03:19:51 +00:00
Lokesh Kumar Goel
4766ddbc2b Update lynx SVN to 12 
Bug: 289414927
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:6cf45075996b2ba74664880a40100fcad35bbf8a)
Merged-In: Id1c1deb4b83db651e2bbeea318bb6f968b6e31dd
Change-Id: Id1c1deb4b83db651e2bbeea318bb6f968b6e31dd
 2023-06-30 03:14:21 +00:00