Graf commitů

1771 Commity

Autor SHA1 Zpráva Datum
Xin Li
dc75d8a2bc Merge Android 14 QPR1
Merged-In: I47cd9c92e39ae43730b1195379235913300a49c0
Bug: 315507370
Change-Id: I239c08edf0a2f6479836a2f4a46ea3fc83d3be2d
2023-12-08 13:13:24 -08:00
Xin Li
b4d0e7c821 Merge UQ1A.231205.015
Bug: 308969284
Merged-In: Ib3ccc703aba169eba719121c42cbc248d7d5d477
Change-Id: I47cd9c92e39ae43730b1195379235913300a49c0
2023-12-07 15:47:12 -08:00
Herbert Xue
d8dda1f2ff Remove unused Android.mk under device/google/lynx am: eaadd11df8
Original change: https://android-review.googlesource.com/c/device/google/lynx/+/2832603

Change-Id: I5054babc769d85275c31ff6dd45760812f3e68c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-20 03:23:52 +00:00
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
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
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
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
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
Android Build Coastguard Worker
76cbd2286f Merge cherrypicks of ['googleplex-android-review.googlesource.com/24896429'] into udc-qpr1-release.
Change-Id: Idfb1db56b24c1b089d73f6bfc86ceb24e9e12f46
2023-10-17 02:45:30 +00:00
Lokesh Kumar Goel
d7ecaa11fa Update lynx SVN to 20
Bug: 302612466
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:771547b88e03c964c56e530fc1fc7c58c6b36fcb)
Merged-In: I3929cc8f47075a22d47c580a1ebc3acdef5ee589
Change-Id: I3929cc8f47075a22d47c580a1ebc3acdef5ee589
2023-10-17 02:41:09 +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
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
Android Build Coastguard Worker
dbe0e9ec6a Snap for 10832001 from c0a5bc0825 to udc-qpr1-release
Change-Id: I86b8ca697130367909047626b7d08b9af5a28cdf
2023-09-19 23:03:06 +00: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
Android Build Coastguard Worker
267633cd5a Snap for 10804332 from 6e8a6e788b to udc-qpr1-release
Change-Id: I6944df45f56644091c2a0e09da0180c7f9cc0b2c
2023-09-13 23:02:35 +00: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
Android Build Coastguard Worker
891992a624 Snap for 10797983 from 3b12d59b95 to udc-qpr1-release
Change-Id: I8960f3cda35575d07d28ffbc977704735684d3fc
2023-09-12 23:02:51 +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
Android Build Coastguard Worker
f8068ebff4 Snap for 10791906 from 003e71105f to udc-qpr1-release
Change-Id: If61059e69c2298af57bd2128e6e1778fcc1e4c4a
2023-09-11 23:02:26 +00:00