Ankur Bakshi
13f56384a8
Update lynx SVN to 24
...
Bug: 309529736
Change-Id: Id02da96e176692058b6075f35e29dcdda92e3367
2023-11-11 02:29:21 +00:00
Ankur Bakshi
0741f1bb95
Update lynx SVN to 23 am: b7613b64d9
am: f189a4f305
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/25290512
Change-Id: Iafa5d78f3e2d499dfacc49017da45bac915622fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-11 02:10:28 +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
14faa31077
[automerger skipped] Merge "Revert "lynx(nfc): Modify NFC overlays for NFC apex"" into main am: fe8604e7e8
am: 871731dc49
-s ours am: 381602ef91
-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: Ie6615685b76afb33709076a7386e0dd10273c385
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 23:34:36 +00:00
Roshan Pius
70723f2f08
[automerger skipped] Revert "lynx: Replace NFC app with NFC apex" am: 8562f5b786
am: bb3cb40239
am: 698652c600
-s ours
...
am skip reason: Merged-In If440c4bcad742af7c6d597eac9e45ce4d56453a4 with SHA-1 b1df779431
is already in history
Original change: https://android-review.googlesource.com/c/device/google/lynx/+/2816579
Change-Id: I7f6892337a1d15420daf453289cf60b8f392a609
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 23:34:20 +00:00
Roshan Pius
75a54695b1
[automerger skipped] Merge "Revert "lynx(nfc): Modify NFC overlays for NFC apex"" into main am: fe8604e7e8
am: fed9aa059d
am: 00e0f6e9de
-s ours
...
am skip reason: Merged-In Icd19426cf13ab0b1092de4dc1abf79b850d04f3f with SHA-1 b8729b4c8c
is already in history
Original change: https://android-review.googlesource.com/c/device/google/lynx/+/2818132
Change-Id: I125f3554b715244d271cc71a46b22d5586301781
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 23:30:47 +00:00
Roshan Pius
89f0d8a32f
[automerger skipped] Revert "lynx: Replace NFC app with NFC apex" am: 8562f5b786
am: 42136d32a0
am: 51583737a9
-s ours
...
am skip reason: Merged-In If440c4bcad742af7c6d597eac9e45ce4d56453a4 with SHA-1 b1df779431
is already in history
Original change: https://android-review.googlesource.com/c/device/google/lynx/+/2816579
Change-Id: I20734f7c210154949eadd8d3bcdf0ebaa71f6450
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-08 23:30:32 +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
Poomarin Phloyphisut
22016f30e0
[USB AIDL] Remove USB configuration from audio_platform_configuration.xml
...
These configs are hardcoded into audio HAL instead because it's very rarely changed.
Bug: 307439907
Test: Local Test.
Change-Id: I519a59ef19e880f3e33687c779de6a8bdbcfe733
2023-11-08 11:38:35 +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
Roshan Pius
b8729b4c8c
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
(cherry picked from https://android-review.googlesource.com/q/commit:68ca561dc4c9b9bdc3fef431c82957f4f1e86f46 )
Merged-In: Icd19426cf13ab0b1092de4dc1abf79b850d04f3f
Change-Id: Icd19426cf13ab0b1092de4dc1abf79b850d04f3f
2023-11-06 14:30:47 +00:00
Roshan Pius
b1df779431
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
Change-Id: If440c4bcad742af7c6d597eac9e45ce4d56453a4
Test: Compiles, device boots up
2023-11-06 14:30:47 +00:00
Greg Kaiser
ea226921ea
[automerger skipped] Fix lunch choices for git_main am: 644a59b607
am: 3d2670dcaa
-s ours am: d6ddf5dc46
-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: I834f9b7781f81e677f671e78bdf04d920002ba53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-31 00:15:49 +00:00
Greg Kaiser
8c1ed26491
[automerger skipped] Fix lunch choices for git_main am: 644a59b607
am: 5be906235d
am: 5bc21fedf4
-s ours
...
am skip reason: Merged-In I7b31c905be1d994de52652162c0bd2bc8c5b8c65 with SHA-1 ae5df6c5a3
is already in history
Original change: https://android-review.googlesource.com/c/device/google/lynx/+/2811080
Change-Id: I438526c0f01151e2d835f4662429eac93e587c71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-31 00:14:06 +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
gilliu
ff1256f40c
display : update make file for display_golden_cal0.pb
...
Bug: 299028202
Test: Check libdisplaycolor log
Change-Id: Ic611aa019bf4a9c1058815bc60ae1221aab3bcd9
2023-10-30 12:08:23 +00:00
Will Song
138db44373
PREUPLOAD: Enforce jsonlint in preupload
...
Checks syntax and simple brace balances for all JSON files.
Test: Edit any json file and try upload
Bug: 127794899
Change-Id: I59436ef5456f9826fe9d2dc76107d65194939418
2023-10-29 07:20:33 +00:00
Greg Kaiser
ae5df6c5a3
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
Change-Id: I7b31c905be1d994de52652162c0bd2bc8c5b8c65
2023-10-27 14:22:18 +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
82838de8b1
Update lynx SVN to 22 am: 126e54a429
am: 353e5aa3a7
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/25169439
Change-Id: Ifa85e6256dc0f13884f10f88f6e3bc56e2a05ea2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-27 03:18:21 +00:00
Cyan_Hsieh
6141679fa5
Split bootloader prebuilt to 24Q1 and trunk version
...
Bug: 299879102
Change-Id: Ieaea8397a0c81c5c6d78613a2a08376b7d71f4db
2023-10-27 03:04:46 +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
753213afd4
Adding Fast Pair extended IDs for L10 am: 738a0e9359
am: 39dd01e133
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/25062409
Change-Id: I69ed684007a7493d93e6824f9e9919f8f855ba3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 23:50:40 +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
86c1a64f39
Update lynx SVN to 21 am: 02c0ddcf51
am: 48c0187392
am: 6718e150c6
am: 47a93eb2f9
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/25177037
Change-Id: I5bbe552c47f5bc9679e0049bf4c53d3a2abdcaf6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 22:22:29 +00:00
Lokesh Kumar Goel
65a58e1f61
[automerger skipped] Update lynx SVN to 20 am: 3a0d94f0d0
am: cc5f316bba
-s ours am: 20b24e4102
-s ours am: 22bc688138
-s ours
...
am skip reason: skipped by user lokeshgoel
Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/25176539
Change-Id: Ia31e5770938bfb197d161a74d85d5870f326cb67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 22:21:51 +00:00
Lokesh Kumar Goel
0c1bb9d0ce
Update lynx SVN to 21 am: 02c0ddcf51
am: 733d6eea60
am: eda7403e0f
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/25177037
Change-Id: I50638423a781145a6c87f2382b974d0a7494cd5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 22:19:41 +00:00
Lokesh Kumar Goel
2561a46ec7
[automerger skipped] Update lynx SVN to 20 am: 3a0d94f0d0
am: ad27cbca2a
-s ours am: 2f3237009e
-s ours
...
am skip reason: skipped by user lokeshgoel
Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/25176539
Change-Id: Icfe457034d0ad37f385244c26fc9ef2ff4c63293
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 21:56:37 +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