summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Android.bp1
-rw-r--r--modules/audio_remote_submix/audio_hw.cpp3
-rw-r--r--modules/usbaudio/audio_hal.c2
3 files changed, 5 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp
index 88e0d44f..6baab685 100644
--- a/Android.bp
+++ b/Android.bp
@@ -64,6 +64,7 @@ cc_library_headers {
apex_available: [
"//apex_available:platform",
"com.android.btservices",
+ "com.android.media",
"com.android.media.swcodec",
],
min_sdk_version: "29",
diff --git a/modules/audio_remote_submix/audio_hw.cpp b/modules/audio_remote_submix/audio_hw.cpp
index f96854b5..5019ae5b 100644
--- a/modules/audio_remote_submix/audio_hw.cpp
+++ b/modules/audio_remote_submix/audio_hw.cpp
@@ -679,7 +679,8 @@ static int out_set_parameters(struct audio_stream *stream, const char *kvpairs)
// FIXME this is using hard-coded strings but in the future, this functionality will be
// converted to use audio HAL extensions required to support tunneling
- if ((parms.getInt(String8("exiting"), exiting) == NO_ERROR) && (exiting > 0)) {
+ if ((parms.getInt(String8(AUDIO_PARAMETER_KEY_EXITING), exiting) == NO_ERROR)
+ && (exiting > 0)) {
struct submix_audio_device * const rsxadev =
audio_stream_get_submix_stream_out(stream)->dev;
pthread_mutex_lock(&rsxadev->lock);
diff --git a/modules/usbaudio/audio_hal.c b/modules/usbaudio/audio_hal.c
index 43f8d240..d77f7ec6 100644
--- a/modules/usbaudio/audio_hal.c
+++ b/modules/usbaudio/audio_hal.c
@@ -1510,6 +1510,8 @@ static int adev_open_input_stream(struct audio_hw_device *hw_dev,
ret = 0;
}
}
+ } else if (profile_is_sample_rate_valid(&device_info->profile, config->sample_rate)) {
+ in->config.rate = config->sample_rate;
}
} else if (profile_is_sample_rate_valid(&device_info->profile, config->sample_rate)) {
in->config.rate = config->sample_rate;