aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoonas Kylmälä <joonas.kylmala@iki.fi>2020-04-08 13:38:35 -0400
committerJoonas Kylmälä <joonas.kylmala@iki.fi>2020-04-08 13:39:38 -0400
commitf8a7e989137fc78032f216be3dcd339ac6b8e2bc (patch)
tree48487adcc43219930aad5725841f6de4593fbae5
parent272dcb598f13881c39a79d190850ce883074e451 (diff)
downloaddevice_samsung_i9300-f8a7e989137fc78032f216be3dcd339ac6b8e2bc.tar.gz
device_samsung_i9300-f8a7e989137fc78032f216be3dcd339ac6b8e2bc.tar.bz2
device_samsung_i9300-f8a7e989137fc78032f216be3dcd339ac6b8e2bc.zip
Use stub audio settings
We have no audio implemented yet so let's use the audio settings for devices that have no audio devices. Signed-off-by: Joonas Kylmälä <joonas.kylmala@iki.fi>
-rw-r--r--BoardConfig.mk2
-rw-r--r--device.mk11
2 files changed, 7 insertions, 6 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk
index e631a39..adc5878 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -76,3 +76,5 @@ BOARD_BUILD_SYSTEM_ROOT_IMAGE := true
BOARD_USES_GENERIC_AUDIO := true
DEVICE_MANIFEST_FILE := device/samsung/i9305/manifest.xml
+
+USE_XML_AUDIO_POLICY_CONF := 1
diff --git a/device.mk b/device.mk
index 5eb1b0c..b82c564 100644
--- a/device.mk
+++ b/device.mk
@@ -33,8 +33,7 @@ PRODUCT_PACKAGES += \
android.hardware.graphics.composer@2.1-service \
# Audio
-PRODUCT_PACKAGES += audio.primary.i9305
-PRODUCT_PACKAGES += audio.primary.i9305_legacy
+PRODUCT_PACKAGES += audio.stub.default
PRODUCT_PACKAGES += android.hardware.audio@2.0-service
PRODUCT_PACKAGES += android.hardware.audio@4.0-impl
PRODUCT_PACKAGES += android.hardware.audio@4.0-service
@@ -55,12 +54,12 @@ PRODUCT_PACKAGES += \
PRODUCT_COPY_FILES += \
frameworks/av/media/libeffects/data/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml \
- device/samsung/i9305/audio_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy.conf \
- frameworks/av/services/audiopolicy/config/audio_policy_configuration_generic.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \
- frameworks/av/services/audiopolicy/config/primary_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/primary_audio_policy_configuration.xml \
+ frameworks/av/services/audiopolicy/config/audio_policy_configuration_stub.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \
+ frameworks/av/services/audiopolicy/config/stub_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/stub_audio_policy_configuration.xml \
frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/r_submix_audio_policy_configuration.xml \
frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \
- frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml
+ frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \
+ frameworks/av/services/audiopolicy/config/surround_sound_configuration_5_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/surround_sound_configuration_5_0.xml
# DRM HAL packages
PRODUCT_PACKAGES += \