From ae142f4d60d0719ec5504ef39a8f3aca23e92814 Mon Sep 17 00:00:00 2001 From: Carter Hsu Date: Thu, 14 Mar 2024 14:53:42 +0800 Subject: [PATCH 1/2] audio: disable the audio proxy hal(mediashell) Bug: 329351565 Test: atest VtsHalAudioV7_1TargetTest Signed-off-by: Carter Hsu (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:bcef5e2c3fd4cb1c6b5c38a3be25cd95b31c3122) Merged-In: I9ce27a764a09b8d878d4d14ed956205000355610 Change-Id: I9ce27a764a09b8d878d4d14ed956205000355610 --- audio/tangorpro/audio-tables.mk | 1 - .../config/audio_policy_configuration.xml | 2 - ...cy_configuration_a2dp_offload_disabled.xml | 2 - ...icy_configuration_bluetooth_legacy_hal.xml | 2 - .../audio_proxy_policy_configuration.xml | 48 ------------------- device-tangorpro.mk | 10 ---- device_framework_matrix_product_tangorpro.xml | 21 -------- public.libraries-google-tangorpro.txt | 1 - 8 files changed, 87 deletions(-) delete mode 100644 audio/tangorpro/config/audio_proxy_policy_configuration.xml delete mode 100644 device_framework_matrix_product_tangorpro.xml delete mode 100644 public.libraries-google-tangorpro.txt diff --git a/audio/tangorpro/audio-tables.mk b/audio/tangorpro/audio-tables.mk index 31469ba..2e0f627 100644 --- a/audio/tangorpro/audio-tables.mk +++ b/audio/tangorpro/audio-tables.mk @@ -33,7 +33,6 @@ PRODUCT_COPY_FILES += \ device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \ device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/config/audio_platform_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration.xml \ device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/config/sound_trigger_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_configuration.xml \ - device/google/tangorpro/audio/$(AUDIO_TABLE_FOLDER)/config/audio_proxy_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_proxy_policy_configuration.xml \ frameworks/av/services/audiopolicy/config/bluetooth_with_le_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration_7_0.xml # AudioEffectHAL Configuration diff --git a/audio/tangorpro/config/audio_policy_configuration.xml b/audio/tangorpro/config/audio_policy_configuration.xml index 15c529b..7378357 100644 --- a/audio/tangorpro/config/audio_policy_configuration.xml +++ b/audio/tangorpro/config/audio_policy_configuration.xml @@ -255,8 +255,6 @@ - - diff --git a/audio/tangorpro/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/tangorpro/config/audio_policy_configuration_a2dp_offload_disabled.xml index b373ecc..56dce30 100644 --- a/audio/tangorpro/config/audio_policy_configuration_a2dp_offload_disabled.xml +++ b/audio/tangorpro/config/audio_policy_configuration_a2dp_offload_disabled.xml @@ -234,8 +234,6 @@ - - diff --git a/audio/tangorpro/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/tangorpro/config/audio_policy_configuration_bluetooth_legacy_hal.xml index b321568..47b581c 100644 --- a/audio/tangorpro/config/audio_policy_configuration_bluetooth_legacy_hal.xml +++ b/audio/tangorpro/config/audio_policy_configuration_bluetooth_legacy_hal.xml @@ -226,8 +226,6 @@ - - diff --git a/audio/tangorpro/config/audio_proxy_policy_configuration.xml b/audio/tangorpro/config/audio_proxy_policy_configuration.xml deleted file mode 100644 index 88de36a..0000000 --- a/audio/tangorpro/config/audio_proxy_policy_configuration.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - MediaShell Direct Audio Device - MediaShell Mixer Audio Device - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/device-tangorpro.mk b/device-tangorpro.mk index b5137f9..1584fba 100644 --- a/device-tangorpro.mk +++ b/device-tangorpro.mk @@ -299,13 +299,6 @@ PRODUCT_PACKAGES += \ PRODUCT_SOONG_NAMESPACES += device/google/tangorpro/audio/tangorpro/prebuilt/libspeechenhancer -# AudioProxy -PRODUCT_PACKAGES += \ - libaudio_proxy.google \ - device.google.atv.audio_proxy@7.1-service - -DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE := device/google/tangorpro/device_framework_matrix_product_tangorpro.xml - #Audio PRODUCT_PROPERTY_OVERRIDES += \ persist.vendor.audio.speech_enhancement.enable=1 @@ -314,9 +307,6 @@ PRODUCT_PACKAGES += \ libspeechenhancer \ audio_speech_enhancer_aoc -PRODUCT_COPY_FILES += \ - device/google/tangorpro/public.libraries-google-tangorpro.txt:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/public.libraries-google.txt - # SKU specific RROs PRODUCT_PACKAGES += \ SettingsOverlayGTU8P diff --git a/device_framework_matrix_product_tangorpro.xml b/device_framework_matrix_product_tangorpro.xml deleted file mode 100644 index 86fe457..0000000 --- a/device_framework_matrix_product_tangorpro.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - device.google.atv.audio_proxy - 3 - - IAudioProxy - mediashell - - - - android.hardware.audio - hwbinder - 7.1 - - IDevicesFactory - mediashell - - - - diff --git a/public.libraries-google-tangorpro.txt b/public.libraries-google-tangorpro.txt deleted file mode 100644 index 2a2d2fe..0000000 --- a/public.libraries-google-tangorpro.txt +++ /dev/null @@ -1 +0,0 @@ -libaudio_proxy.google.so From 0b1f5e7fc9d8a101cdad7d3266ecb176628b563d Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Thu, 6 Jun 2024 17:49:46 +0000 Subject: [PATCH 2/2] tangor: Enable flag to enable/disable persistent cache for country code This will be useful for devices that don't have cellular. Bug: 339139695 Change-Id: Id1e1267ab774725d18687193c1e168dc543a1e7d Test: None --- rro_overlays/UwbOverlay/res/values/config.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/rro_overlays/UwbOverlay/res/values/config.xml b/rro_overlays/UwbOverlay/res/values/config.xml index fcbfa5f..15cfbf4 100644 --- a/rro_overlays/UwbOverlay/res/values/config.xml +++ b/rro_overlays/UwbOverlay/res/values/config.xml @@ -63,4 +63,10 @@ This works best with an FOV primer setting below 90 degrees to ensure that predictions are being used across the 90-degree threshold. --> false + + + true