Commit Graph

2158 Commits

Author SHA1 Message Date
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
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
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
18c92bf759 Update lynx SVN to 21 am: 02c0ddcf51 am: 2557a9e583
Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/25177037

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

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

Change-Id: I7ec36cdd248917eeb1a375a3050b39792071c445
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 21:28:59 +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
2557a9e583 Update lynx SVN to 21 am: 02c0ddcf51
Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/25177037

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

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

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

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

Change-Id: I2f33b749fb17025fee529b0caf04c5e82d3ba605
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-25 21:10:23 +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
TeYuan Wang
f924e4d528 thermal: align the setting VSKIN related sensors
Bug: 302435949
Test: emul_temp
Change-Id: I3e2b993f48d2d0b3315c636d1f3e646a3d738056
2023-10-20 13:51:17 -07:00
Cheng Chang
71af0a7d9a gps: Enable Vzw SUPL OTDOA
Bug: 303401506
Test: OTDOA test in b/303401506
Change-Id: I6bfe726c02dd672a7cffbe1ed97e6c719f5d6688
2023-10-20 03:49:14 +00:00
Xin Li
01ec35e9be [automerger skipped] Merge 10952656 am: 2752cdf1ab -s ours am: 26f2eb1d3e -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: I42d7858722f7195e7873097b1b7b5eea7898c1fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19 23:54:33 +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
f639545678 [automerger skipped] Merge "lynx: Replace NFC app with NFC apex" into main am: 86e259c1c0 am: e22afc3211 am: 399ffed584 am: efb33b30b4 am: 8b5cbe97a1 -s ours
am skip reason: Merged-In Id85d62a10589765dffa293770bca9d0906eb2973 with SHA-1 be320b794b is already in history

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

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

Change-Id: I7c7886ba219a1d2c8e0bbf1f1630e9f70826375b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-16 05:35:25 +00:00