Commit Graph

1711 Commits

Author SHA1 Message Date
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
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
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
Xin Li
2752cdf1ab Merge 10952656
Merged-In: I11c4c8b1b9097b540e94f7afaa57442b6d303efa
Change-Id: Iffa8b485b4eb0c28824fea1326a3e73a49552fd1
2023-10-17 10:06:30 -07: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
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
Xin Li
87c8560aa8 [automerger skipped] Merge UP1A.231005.007 am: 682a3bd546 -s ours am: 183e4ee15e -s ours am: 0536133bb2 -s ours
am skip reason: Merged-In Iffadfd1f436b5ce27c2332a68f6d8d7c5b76507e with SHA-1 75f1a483a6 is already in history

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

Change-Id: I6320bca376d6212cab9f35b296087b6103339b4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-29 09:04:30 +00:00
Xin Li
0536133bb2 [automerger skipped] Merge UP1A.231005.007 am: 682a3bd546 -s ours am: 183e4ee15e -s ours
am skip reason: Merged-In Iffadfd1f436b5ce27c2332a68f6d8d7c5b76507e with SHA-1 75f1a483a6 is already in history

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

Change-Id: I4b68d7580ebd580adfeb1820c7bc392da194b784
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-29 08:16:27 +00:00
Xin Li
183e4ee15e [automerger skipped] Merge UP1A.231005.007 am: 682a3bd546 -s ours
am skip reason: Merged-In Iffadfd1f436b5ce27c2332a68f6d8d7c5b76507e with SHA-1 75f1a483a6 is already in history

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

Change-Id: I33082f08959ff037e455e386fae894ef2a53c380
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-29 07:15:38 +00:00
Xin Li
682a3bd546 Merge UP1A.231005.007
Bug: 291102124
Merged-In: Iffadfd1f436b5ce27c2332a68f6d8d7c5b76507e
Change-Id: If0cb0cf81edabfd491128f6fe95f39e2678397ff
2023-09-27 16:04:23 -07:00
Willy Hu
1756c06b8d Apply new IA requirement on M23 device am: c0a5bc0825
Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/24754268

Change-Id: I4d8da6cb546c019f621c0ba60a3306b8ee81e07e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 08:50:42 +00:00
Willy Hu
c0a5bc0825 Apply new IA requirement on M23 device
See b/227579876, for P23 and later, we can send null initial attach data profile to modem to clear any previoud data profiles.

Bug: 300203182
Change-Id: I42fefc7b1b17345978e7283f19b8ac73890e4cd3
Test: Build pass.
2023-09-19 08:20:06 +00:00
Rick Yiu
54e6ad05d1 Disable limiting camera_hal for LAUNCH hint am: 6802c8083d
Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/24797290

Change-Id: I035bfd289388ec885ef3dd28495cd1a4d571a5a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 07:57:36 +00:00
Rick Yiu
6802c8083d Disable limiting camera_hal for LAUNCH hint
If auto rotation is enabled, it will trigger LAUNCH hint while
camera is running if device rotates, which could limit camera_hal
tasks to little cores. So, disable it first until there is a new
hint for the rotation event.

Bug: 297273578
Test: build pass
Change-Id: I5040ae4893632f7f7b88cb23ad45554f17fee04c
2023-09-19 07:10:47 +00:00
Alice Kuo
55baa28451 Config P23a as LE audio hidden by default am: 0155c6cdaf
Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/24786387

Change-Id: I56280224364b39633944de397eff776bee587712
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 07:05:06 +00:00
Alice Kuo
0155c6cdaf Config P23a as LE audio hidden by default
Based on the lunch stratgey, hide LE audio toggle for P23a (Phase 1) for now

Bug: 300807171
Test: LE audio toggle isn't shown on Device Detail by default
Change-Id: I193e31d1be1d234da6b099db4badcb03c09bb643
2023-09-18 11:03:10 +08:00
Jayant Chowdhary
c10818f66c Revert "DeviceAsWebcam: Add overlays for physical camera id" am: 6e8a6e788b
Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/24737591

Change-Id: I433c44e2b9d0ed6e803cc5e24efab05821aebdb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-13 02:10:31 +00:00
Jayant Chowdhary
6e8a6e788b Revert "DeviceAsWebcam: Add overlays for physical camera id"
This reverts commit 24f43348a9.

Reason for revert: With stream use case VIDEO_CALL + logical stream power is well within the permissible limit of 3W.

Bug: 300166920

Change-Id: Ic5254d9c5ace2b3ce7b4841078fa5ce43b3d9eef
2023-09-13 01:35:46 +00:00
Carter Hsu
a8445f1b34 audio: FM table check in for QPR1 am: cfe5e68227
Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/24677404

Change-Id: Ib579805968e6f523147716de32f08105c28e9542
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-13 01:19:14 +00:00
Carter Hsu
cfe5e68227 audio: FM table check in for QPR1
L10 for Kid's voice for all user-cases
Index 526 TX_DR_RESRV_7 0x0000 -> 0x122E
Index 527 TX_DR_RESRV_8 0x0000 -> 0x1100

Bug: 299580663
Test: Verified by test build, b/299580663#comment5
Change-Id: Ia5bfdd96a6030455c1ae63bacd78595c9460654a
Signed-off-by: Carter Hsu <carterhsu@google.com>
2023-09-13 00:46:33 +00:00
Patty Huang
27fda4234b Disable 32k dual mic support on P23a project am: 3b12d59b95
Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/24659990

Change-Id: Iac0d66bd16f2fafd83c417ab5792a68c664b016b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 11:15:51 +00:00
Patty Huang
3b12d59b95 Disable 32k dual mic support on P23a project
Based on the phase 2 strategy, disable dual mic support on
P23a project

Bug: 298893319
Test: Ensure 32k dual mic config will not be selected
Change-Id: Iae20a938410c70cefe6ea20723f53b16433b1828
2023-09-12 10:34:43 +00:00
Poomarin Phloyphisut
d9bf25f1ea [USB Audio AIDL] Fix wrong capture path on mixer_paths.xml am: 4ebe12919c
Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/24718310

Change-Id: Ib11b2ce6b26a1e647281a5e745ab202e5c12a46e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 04:41:16 +00:00
Poomarin Phloyphisut
4ebe12919c [USB Audio AIDL] Fix wrong capture path on mixer_paths.xml
Bug: 299388175
Test: Local Test
Change-Id: Ie064c8956a730bc33f1a67133edd371c7fa1519e
2023-09-12 03:48:22 +00:00
Ankur Bakshi
48bad36023 Update lynx SVN to 19 am: 2b2fdad817 am: 9befc027fe am: 003e71105f
Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/24699139

Change-Id: I56f5b8f19045ad348777bdb04113087d93a72034
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 20:34:04 +00:00
Ankur Bakshi
8f5365a570 Update lynx SVN to 18 am: 9909067723 am: b0128e5e9e am: 14f6d26e7b
Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/24687081

Change-Id: Id56af6905361136adfb0d10cc8ce728cb09790d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 20:34:01 +00:00
Ankur Bakshi
c7da0d06fc Update lynx SVN to 19 am: 2b2fdad817 am: 9befc027fe am: 9137731141
Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/24699139

Change-Id: Ic16046daba85a7445b36d825ddcfb641ac3c7acf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 20:30:25 +00:00
Ankur Bakshi
2f317815e8 Update lynx SVN to 18 am: 9909067723 am: b0128e5e9e am: 0eea643d1b
Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/24687081

Change-Id: Iaa63cd1fc5bb47f8d2f901be6a7f530c1088e341
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 20:30:23 +00:00
Ankur Bakshi
b3117ed67d Update lynx SVN to 19 am: 2b2fdad817 am: 746df61329 am: 455b93402b
Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/24699139

Change-Id: I85afe2072efe56c0bc77743bebd929ddbcca7497
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 20:24:13 +00:00
Ankur Bakshi
bf4604b340 Update lynx SVN to 18 am: 9909067723 am: 0ba105017e am: 8b2180134e
Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/24687081

Change-Id: I9feed81a95c7e10eef39bf21858909c85e592e5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 20:24:10 +00:00
Ankur Bakshi
003e71105f Update lynx SVN to 19 am: 2b2fdad817 am: 9befc027fe
Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/24699139

Change-Id: I21d31ac3174f42392913129da982c777591ca029
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 19:50:00 +00:00
Ankur Bakshi
14f6d26e7b Update lynx SVN to 18 am: 9909067723 am: b0128e5e9e
Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/24687081

Change-Id: I17db863802c714ab8df29c116214d4f89a49e920
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 19:49:57 +00:00
Ankur Bakshi
9137731141 Update lynx SVN to 19 am: 2b2fdad817 am: 9befc027fe
Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/24699139

Change-Id: I22e00498bbb0da73f0d6cfc78ecfc183af1ff50c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 19:47:30 +00:00
Ankur Bakshi
0eea643d1b Update lynx SVN to 18 am: 9909067723 am: b0128e5e9e
Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/24687081

Change-Id: Ica88027fa8bb3fa862dcada2ec9c1ce742d1ef8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 19:47:28 +00:00
Ankur Bakshi
455b93402b Update lynx SVN to 19 am: 2b2fdad817 am: 746df61329
Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/24699139

Change-Id: Idb46187c9e52ad113ca6ce303cf19944edd1c994
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 19:47:06 +00:00
Ankur Bakshi
8b2180134e Update lynx SVN to 18 am: 9909067723 am: 0ba105017e
Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/24687081

Change-Id: Idae292c43b0d205cdcad5680941775ba15f28841
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 19:47:03 +00:00
Ankur Bakshi
9befc027fe Update lynx SVN to 19 am: 2b2fdad817
Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/24699139

Change-Id: I740d8ffc2214c3e2f72f5294e2148891388a03c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 18:53:59 +00:00
Ankur Bakshi
b0128e5e9e Update lynx SVN to 18 am: 9909067723
Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/24687081

Change-Id: I0f0f6e6d12cb2280d2db633485df036ad0f36ec6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 18:53:56 +00:00
Ankur Bakshi
746df61329 Update lynx SVN to 19 am: 2b2fdad817
Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/24699139

Change-Id: I9183e8a04c9d50afb8625b7141af79cf714490c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 18:51:18 +00:00
Ankur Bakshi
0ba105017e Update lynx SVN to 18 am: 9909067723
Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/24687081

Change-Id: I9d22503d3178dec3fecc2679a04d7da80fc8e55c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 18:51:16 +00:00
Ankur Bakshi
2b2fdad817 Update lynx SVN to 19
Bug: 298087649
Change-Id: I370515ae8b4f972059a8af4625dc55a052bb7348
2023-09-08 01:29:57 +00:00
Ankur Bakshi
9909067723 Update lynx SVN to 18
Bug: 298087649
Change-Id: Iadd6e0f8767cc8acfa0040b43190b3f2b35320de
2023-09-07 05:15:57 +00:00
Xin Li
b04199c699 [automerger skipped] Merge UP1A.230905.019 am: 0ea3181c68 -s ours am: 6fb6425739 -s ours am: aeeeaa2cfc -s ours
am skip reason: Merged-In I8981f42c3b0b8ba9e5246c0aaedaafc5d7bfe71a with SHA-1 298ba980a2 is already in history

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

Change-Id: I563eed0f0ebf63b7947e057311be428aff588f43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-05 21:07:28 +00:00