diff options
| -rw-r--r-- | BoardConfig.mk | 4 | ||||
| -rw-r--r-- | audio_policy.conf | 18 | ||||
| -rw-r--r-- | device.mk | 1 | ||||
| -rw-r--r-- | libaudio/Android.mk | 4 |
4 files changed, 17 insertions, 10 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk index c4f7c49..a7552e3 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -103,10 +103,6 @@ ADDITIONAL_DEFAULT_PROPERTIES += \ ro.hwui.texture_cache_flushrate = 0.4 \ ro.hwui.texture_cache_size = 48.0 \ -# Temporary to workaround b/28521732 & b/27903668 -ADDITIONAL_DEFAULT_PROPERTIES += \ - debug.hwui.use_buffer_age = 0 - MAX_EGL_CACHE_ENTRY_SIZE := 65536 MAX_EGL_CACHE_SIZE := 1048576 diff --git a/audio_policy.conf b/audio_policy.conf index 4e337fe..4dfc2f8 100644 --- a/audio_policy.conf +++ b/audio_policy.conf @@ -3,8 +3,8 @@ # Devices are designated by a string that corresponds to the enum in audio.h global_configuration { - attached_output_devices AUDIO_DEVICE_OUT_SPEAKER - default_output_device AUDIO_DEVICE_OUT_SPEAKER + attached_output_devices AUDIO_DEVICE_OUT_STUB + default_output_device AUDIO_DEVICE_OUT_STUB attached_input_devices AUDIO_DEVICE_IN_REMOTE_SUBMIX } @@ -26,8 +26,7 @@ audio_hw_modules { sampling_rates 48000 channel_masks AUDIO_CHANNEL_OUT_STEREO formats AUDIO_FORMAT_PCM_8_24_BIT - devices AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_AUX_DIGITAL - flags AUDIO_OUTPUT_FLAG_PRIMARY + devices AUDIO_DEVICE_OUT_AUX_DIGITAL } multichannel_out { sampling_rates dynamic @@ -46,6 +45,17 @@ audio_hw_modules { } } } + stub { + outputs { + stub_out { + sampling_rates 48000 + channel_masks AUDIO_CHANNEL_OUT_STEREO + formats AUDIO_FORMAT_PCM_16_BIT + devices AUDIO_DEVICE_OUT_STUB + flags AUDIO_OUTPUT_FLAG_PRIMARY + } + } + } usb { outputs { usb_device { @@ -77,6 +77,7 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ libtinyalsa \ audio.primary.fugu \ + audio.stub.default \ audio.usb.default \ audio.a2dp.default \ audio.r_submix.default \ diff --git a/libaudio/Android.mk b/libaudio/Android.mk index 4f3ca78..b217ec3 100644 --- a/libaudio/Android.mk +++ b/libaudio/Android.mk @@ -46,7 +46,7 @@ LOCAL_SHARED_LIBRARIES := \ # until remotecontrolservice is added to PDK, don't include # this in aosp_fugu builds. only use in regular fugu builds. -ifeq ($(TARGET_PRODUCT),fugu) +ifneq ($(filter fugu fugu_gmscore_next, $(TARGET_PRODUCT)),) LOCAL_C_INCLUDES += \ vendor/google_athome/services/RemoteControlService/include @@ -114,7 +114,7 @@ LOCAL_C_INCLUDES := \ $(TOPDIR)frameworks/av/services/audiopolicy/common/managerdefinitions/include \ $(TOPDIR)frameworks/av/services/audiopolicy/engine/interface -ifeq ($(TARGET_PRODUCT),fugu) +ifneq ($(filter fugu fugu_gmscore_next, $(TARGET_PRODUCT)),) LOCAL_C_INCLUDES += \ vendor/google_athome/services/RemoteControlService/include |