Commit graph

1825 commits

Author SHA1 Message Date
Xin Li
468c8b3d40 Merge Android 14 QPR1
Merged-In: I17fe20380b327b4af1734a761bac585fa5d16eaf
Bug: 315507370
Change-Id: I378db4d2e3cbfbaa271fd8cc07c5015d6c882d1f
2023-12-08 13:13:48 -08:00
Xin Li
0a84ad7caa Merge UQ1A.231205.015
Bug: 308969284
Merged-In: I87fd24ba084691c238f5c07272208049acaf2e5d
Change-Id: I17fe20380b327b4af1734a761bac585fa5d16eaf
2023-12-07 15:47:45 -08:00
Nelson Li
aaad3c04a7 Remove unnecessary Android.mk in device/google/tangorpro am: 29713d8b37
Original change: https://android-review.googlesource.com/c/device/google/tangorpro/+/2836335

Change-Id: I0c0b41ea41041fb621d0f887ec621c002cce10db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-20 03:23:54 +00:00
Nelson Li
29713d8b37 Remove unnecessary Android.mk in device/google/tangorpro
After verification, the top-level Android.mk only includes the
Android.mk of its subdirectories. The only meaningful build target
in the subdirectory is `UwbVendorService`, but it is blocked by the
blank Android.mk in the upper layer and can never be built.
Therefore, all Android.mk in device/google/tangorpro are not necessary
to exist in reality.

Bug: 311511817
Test: N/A
Change-Id: I3c47169481cedc6a23e94a0d3d96bd2a644abe2a
2023-11-17 06:25:16 +00:00
Greg Kaiser
cf92da060d Fix lunch choices for git_main am: 7c566d6f58
Original change: https://android-review.googlesource.com/c/device/google/tangorpro/+/2809880

Change-Id: Ibba251fb2841222dbbb833359dce291f24555d27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-30 23:39:44 +00:00
Greg Kaiser
7c566d6f58 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:6b596fa40f25f419bd1566e801850d31157b4661)
Merged-In: Ieb15ee967e144853e06c66af791187f00c9b3dc1
Change-Id: Ieb15ee967e144853e06c66af791187f00c9b3dc1
2023-10-30 22:01:21 +00:00
Xin Li
77e53f462a Merge 10952656
Merged-In: Ib8c847ed355f1502d0b4bc92af239fbe293a7a36
Change-Id: Iadaafc8a8f2d330ac43645f259f83918ca0700fc
2023-10-17 10:08:04 -07:00
Android Build Coastguard Worker
786bbbeea5 Merge cherrypicks of ['googleplex-android-review.googlesource.com/25019613'] into udc-qpr1-release.
Change-Id: Ic93c1e8ff5aa4a64ce0eb33765ac93be5ab7510b
2023-10-17 02:45:38 +00:00
Per Åhgren
c75ff876a6 Extend the APMg3 tunings to also handling turning AEC off
This CL extends APMg3 tunings for the tablet, dock and headset usecases with counterparts where the AEC is off.

Bug: 301568974
Test: Running CTS test suite verification. Manual testing in calls on Tangor.
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:45e117b89052482423345f4b64bd37a4d3e5ce06)
Merged-In: I87fd24ba084691c238f5c07272208049acaf2e5d
Change-Id: I87fd24ba084691c238f5c07272208049acaf2e5d
2023-10-17 02:41:58 +00:00
Cole Faust
c754c599c5 Use PRODUCT_COPY_FILES to install uwb country files am: e4dd513cc5 am: bb3c61874d am: f1004825be am: ca7148561c
Original change: https://android-review.googlesource.com/c/device/google/tangorpro/+/2777605

Change-Id: Ib8c847ed355f1502d0b4bc92af239fbe293a7a36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11 19:47:19 +00:00
Cole Faust
ca7148561c Use PRODUCT_COPY_FILES to install uwb country files am: e4dd513cc5 am: bb3c61874d am: f1004825be
Original change: https://android-review.googlesource.com/c/device/google/tangorpro/+/2777605

Change-Id: I7f3b170c521ff5b936cbd02dacaa10f716992b93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11 19:13:07 +00:00
Cole Faust
f1004825be Use PRODUCT_COPY_FILES to install uwb country files am: e4dd513cc5 am: bb3c61874d
Original change: https://android-review.googlesource.com/c/device/google/tangorpro/+/2777605

Change-Id: I18125d298d606ac6ea9acd0b625156f647fb413e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11 18:17:37 +00:00
Cole Faust
bb3c61874d Use PRODUCT_COPY_FILES to install uwb country files am: e4dd513cc5
Original change: https://android-review.googlesource.com/c/device/google/tangorpro/+/2777605

Change-Id: I4f97fbbcfffbac4bc5902919d2ee77ec0c59d9b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11 17:45:52 +00:00
Cole Faust
e4dd513cc5 Use PRODUCT_COPY_FILES to install uwb country files
Previously, these files were installed with a custom $(shell) command
in an Android.mk file. This doesn't let the build system know that
these files exist, and breaks hermetic partition builds.

Instead, install them with PRODUCT_COPY_FILES, and add a check that
the list is up-to-date.

Bug: 205632228
Test: Presubmits
Change-Id: I29bf9d51e7341643e441fa7e1f43a6b4f9af84f0
2023-10-06 15:57:36 -07:00
Xin Li
5e54444219 [automerger skipped] Merge Android 14 am: 3ebad0b33f -s ours am: 9da4b49898 -s ours am: 9679e6c9bb -s ours am: d383426a49 -s ours
am skip reason: Merged-In I59c8f4d8420e749da4b58091b45e924c96b18613 with SHA-1 ef85e61aee is already in history

Original change: https://android-review.googlesource.com/c/device/google/tangorpro/+/2775001

Change-Id: I7fce80f094913983df1b03ad6b1440b8291961f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 11:00:55 +00:00
Xin Li
d383426a49 [automerger skipped] Merge Android 14 am: 3ebad0b33f -s ours am: 9da4b49898 -s ours am: 9679e6c9bb -s ours
am skip reason: Merged-In I59c8f4d8420e749da4b58091b45e924c96b18613 with SHA-1 ef85e61aee is already in history

Original change: https://android-review.googlesource.com/c/device/google/tangorpro/+/2775001

Change-Id: Ib32b8bde1e2ecc886d767a1ede74bafae9f2d9d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 09:51:05 +00:00
Xin Li
9679e6c9bb [automerger skipped] Merge Android 14 am: 3ebad0b33f -s ours am: 9da4b49898 -s ours
am skip reason: Merged-In I59c8f4d8420e749da4b58091b45e924c96b18613 with SHA-1 ef85e61aee is already in history

Original change: https://android-review.googlesource.com/c/device/google/tangorpro/+/2775001

Change-Id: I33b74c6b28488804af61717654aeec6fe4afafc1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 08:59:28 +00:00
Xin Li
9da4b49898 [automerger skipped] Merge Android 14 am: 3ebad0b33f -s ours
am skip reason: Merged-In I59c8f4d8420e749da4b58091b45e924c96b18613 with SHA-1 ef85e61aee is already in history

Original change: https://android-review.googlesource.com/c/device/google/tangorpro/+/2775001

Change-Id: I5d7100f70340d294542845d7538689ed217a8a02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 07:52:24 +00:00
Xin Li
3ebad0b33f Merge Android 14
Bug: 298295554
Merged-In: I59c8f4d8420e749da4b58091b45e924c96b18613
Change-Id: I7b915d8d666943a8f5c3e94e20d4f87998f080ac
2023-10-05 15:36:40 -07:00
Android Build Coastguard Worker
3d047aeba3 Snap for 10884398 from b15d3c913f to udc-qpr1-release
Change-Id: I125fedd6cd85efb7d3a3e9eb421267390b55c23a
2023-09-30 03:07:40 +00:00
Per Åhgren
8ed62d412b Merge "Update APMg3 and tuning configs to version 9" into udc-qpr-dev am: b15d3c913f
Original change: https://googleplex-android-review.googlesource.com/c/device/google/tangorpro/+/24884495

Change-Id: Id909daf0285c11286c163ab7bf7cd6fdd83ec732
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-29 08:09:31 +00:00
Per Åhgren
b15d3c913f Merge "Update APMg3 and tuning configs to version 9" into udc-qpr-dev 2023-09-29 06:51:20 +00:00
Android Build Coastguard Worker
c71ef32584 Snap for 10877629 from b6ba4059f1 to udc-qpr1-release
Change-Id: If593e2fc7e4cc956692154baa52964859271d65b
2023-09-28 23:02:55 +00:00
Per Åhgren
84beed357e Update APMg3 and tuning configs to version 9
This CL updates the APMg3 tunings to version 9. The changes performed is to reduce the post-AEC gain to the level that was in the v4 tunings (a 7 dB reduction), as the gain in v8 has been shown to sometimes saturate the nearend.

The tunings are available at
https://drive.google.com/drive/folders/11dKj-dpkNUlcci8kTsxi3lN5Ht5FEzXu?usp=drive_link
Complexity and memory figures are basically the same (slightly lower) as for https://docs.google.com/spreadsheets/d/1ZtPoIw3SGPKErR8xURvp3gyDvNNl7bISCzLFH_HDOIc/edit?usp=sharing&resourcekey=0-q7s7VtDqDSf762Lvb4d7gA

Bug: 302471415
Test: Manual test calls on Tangor using Meet. Lab testing in TPE labs with ACQUA/Headacoustics. Offline testing on recordings.
Change-Id: I12309ab01772724cda9da6bb793586bf0d79715e
2023-09-28 17:53:01 +00:00
shihchienc
0aeab1bb03 [SWB] Disable super wideband am: b6ba4059f1
Original change: https://googleplex-android-review.googlesource.com/c/device/google/tangorpro/+/24882991

Change-Id: If84599d53581b52ac8ac2b53fd103d9a925e4f7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-28 11:08:15 +00:00
shihchienc
b6ba4059f1 [SWB] Disable super wideband
Disable SWB by setting system property

Tag: #feature
Bug: 302436444
Test: flash devices and check property
Change-Id: I5065ff4d6f05efe8c7d8c4aa85ebc8f11d07c44d
2023-09-28 06:46:07 +00:00
Treehugger Robot
79cb66979f Merge "Update UWB CERTIFICATE to PRESIGNED" into aosp-main-future am: d20a9ea621 am: 73d5dd0755 am: 13e86ba81c
Original change: https://googleplex-android-review.googlesource.com/c/device/google/tangorpro/+/24843848

Change-Id: If3e1fc05d12308f8987f58a81a2e6b78d491a470
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25 23:28:12 +00:00
Ryan Prichard
9b4cbedf48 closeSession: actually remove elements from sessions_ am: 0d97a2bd57 am: 16578e55d0 am: 5844c698fa am: d101442b9e
Original change: https://android-review.googlesource.com/c/device/google/tangorpro/+/2758445

Change-Id: I981169e66c678c3df766490804bd9978f46dd123
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25 23:28:06 +00:00
Treehugger Robot
13e86ba81c Merge "Update UWB CERTIFICATE to PRESIGNED" into aosp-main-future am: d20a9ea621 am: 73d5dd0755
Original change: https://googleplex-android-review.googlesource.com/c/device/google/tangorpro/+/24843848

Change-Id: I20b9c6cde9cd4ec9a6d5b07076548edc97cd4b71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25 22:47:04 +00:00
Ryan Prichard
d101442b9e closeSession: actually remove elements from sessions_ am: 0d97a2bd57 am: 16578e55d0 am: 5844c698fa
Original change: https://android-review.googlesource.com/c/device/google/tangorpro/+/2758445

Change-Id: I7bb70844c23873898d4936a91cba338679798a97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25 22:46:56 +00:00
Treehugger Robot
73d5dd0755 Merge "Update UWB CERTIFICATE to PRESIGNED" into aosp-main-future am: d20a9ea621
Original change: https://googleplex-android-review.googlesource.com/c/device/google/tangorpro/+/24843848

Change-Id: I5e40f22e611bb706f8d58c1489f4a79fe18187fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25 21:54:20 +00:00
Ryan Prichard
5844c698fa closeSession: actually remove elements from sessions_ am: 0d97a2bd57 am: 16578e55d0
Original change: https://android-review.googlesource.com/c/device/google/tangorpro/+/2758445

Change-Id: Ia3a01a4f3f46afe2673183ab77e01ef4b9b1b1d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25 21:53:34 +00:00
Treehugger Robot
d20a9ea621 Merge "Update UWB CERTIFICATE to PRESIGNED" into aosp-main-future 2023-09-25 21:07:12 +00:00
Ryan Prichard
16578e55d0 closeSession: actually remove elements from sessions_ am: 0d97a2bd57
Original change: https://android-review.googlesource.com/c/device/google/tangorpro/+/2758445

Change-Id: I3d57e1f9b803ca1207dc265f9b847b7644320bf5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25 20:52:25 +00:00
Wilson Sung
ef85e61aee Update UWB CERTIFICATE to PRESIGNED
Bug: 290766628
Change-Id: I59c8f4d8420e749da4b58091b45e924c96b18613
2023-09-23 03:37:58 +00:00
Ryan Prichard
0d97a2bd57 closeSession: actually remove elements from sessions_
std::remove_if consolidates the non-removed elements at the start of
the vector, but it doesn't change the vector's size. After upgrading
libc++, std::remove_if is [[nodiscard]], so this bug causes a compiler
error.

Bug: 175635923
Test: m android.hardware.drm-service.castkey
Change-Id: Ie9734e616f0f93e290cd61f929af04598f236ee7
2023-09-20 17:36:38 -07:00
Android Build Coastguard Worker
ff16593950 Snap for 10838116 from 1bb9b6b916 to udc-qpr1-release
Change-Id: I59e5ce48ae5c5ae3daf6fe2f8af5c6afb862a076
2023-09-20 23:03:30 +00:00
Per Åhgren
cff4722967 Update APMg3 and tuning configs to version 8 am: 1bb9b6b916
Original change: https://googleplex-android-review.googlesource.com/c/device/google/tangorpro/+/24802808

Change-Id: I972bcaadc634fc6ed10bc47483cb3bcff145623e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 16:42:14 +00:00
Android Build Coastguard Worker
4b3770922c Snap for 10832001 from 8f97e5100c to udc-qpr1-release
Change-Id: I768fd64659e489903912ed6f891bedcd2647f15f
2023-09-19 23:03:26 +00:00
Per Åhgren
1bb9b6b916 Update APMg3 and tuning configs to version 8
This CL updates the APMg3 tunings to version 8. The changes performed is to remove a high-pass filter that replicated what the 3P provider did. Removing this high-pass filter improves the clarity of the near-end speech while having negligible impact on the rest of the processing.

The tunings are available at
https://drive.google.com/drive/folders/1_8KdDcCLUb_ycSY3IMgO3Af11a8McU0S?usp=sharing
Complexity and memory figures are basically the same (slightly lower) as for https://docs.google.com/spreadsheets/d/1ZtPoIw3SGPKErR8xURvp3gyDvNNl7bISCzLFH_HDOIc/edit?usp=sharing&resourcekey=0-q7s7VtDqDSf762Lvb4d7gA

Bug: 301140272
Test: Manual test calls on Tangor using Meet. Lab testing in audio labs with ACQUA/Headacoustics test suites.
Change-Id: I02a604cb88086c160996cd7e46d7f10f876e68eb
2023-09-19 23:00:10 +00:00
Rick Yiu
1299cb9904 Merge "Disable limiting camera_hal for LAUNCH hint" into udc-qpr-dev am: 8f97e5100c
Original change: https://googleplex-android-review.googlesource.com/c/device/google/tangorpro/+/24795749

Change-Id: Ia227188e69a00bedc7223462b620922d91009c86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 07:57:36 +00:00
Rick Yiu
8f97e5100c Merge "Disable limiting camera_hal for LAUNCH hint" into udc-qpr-dev 2023-09-19 07:10:50 +00:00
Treehugger Robot
bc739eefba Merge "Config T6pro as LE audio hidden by default" into udc-qpr-dev am: 17c6d5afa7
Original change: https://googleplex-android-review.googlesource.com/c/device/google/tangorpro/+/24785749

Change-Id: I4a5a8402d3451852ebc8f6db67fe167cc4a7d0a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 07:05:06 +00:00
Treehugger Robot
17c6d5afa7 Merge "Config T6pro as LE audio hidden by default" into udc-qpr-dev 2023-09-19 06:31:29 +00:00
Rick Yiu
d46e930521 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: I104bdf8952da66346ecf73ed02245b8bc4be3ee8
2023-09-19 03:00:46 +00:00
Alice Kuo
9ceef720f1 Config T6pro as LE audio hidden by default
Based on the lunch stratgey, hide LE audio toggle for T6pro (Phase 1) for now

Bug: 300807171
Test: LE audio toggle isn't shown on Device Detail by default
Change-Id: Id29ae19cdf527df368fd94ba5cac7897d420e650
2023-09-18 11:03:54 +08:00
Android Build Coastguard Worker
af84b26733 Snap for 10817717 from 79357a1d08 to udc-qpr1-release
Change-Id: Ibcae2f7511af815baecf8355514a4bdf46377a02
2023-09-16 01:07:20 +00:00
Per Åhgren
aa3518c955 Update APMg3 and tuning configs to version 7 am: 79357a1d08
Original change: https://googleplex-android-review.googlesource.com/c/device/google/tangorpro/+/24727642

Change-Id: I2404524bef3c85d4022a0beb610f78035a3f6013
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-14 23:24:20 +00:00
Android Build Coastguard Worker
f208d85bf7 Snap for 10797983 from 2f15b17c07 to udc-qpr1-release
Change-Id: Ia966746925c9d457cc84da1ea4c07c73dc976fb8
2023-09-12 23:03:12 +00:00
Per Åhgren
79357a1d08 Update APMg3 and tuning configs to version 7
This CL updates the APMg3 tunings to version 7. The changes performed is to remove any signal level gains applied in APMg3 in AOC for the headset usecase. This eliminates the issue of APMg3 applying 25 dB gain when headsets are used causing some headset audio signals to be saturated.

The tunings are available at
https://drive.google.com/drive/folders/1TICEDO_vHlpWR8My91kxJrWTpGNqIStE?usp=sharing.
Complexity and memory figures are basically the same (slightly lower) as for https://docs.google.com/spreadsheets/d/1ZtPoIw3SGPKErR8xURvp3gyDvNNl7bISCzLFH_HDOIc/edit?usp=sharing&resourcekey=0-q7s7VtDqDSf762Lvb4d7gA

Bug: 300147435
Test: Manual test calls on Tangor using Meet.
Change-Id: Ib06e05cbaa0e632deb9a4961a98d0ce9737121fb
2023-09-12 21:58:06 +00:00