Merge LA.UM.6.6.r1-04500-89xx.0lineage-15.1-caf-8937

13 files changed, 14 insertions, 64 deletions

diff --git a/configs/msm8909/msm8909.mk b/configs/msm8909/msm8909.mk
index 6febcf1f..0094b610 100755
--- a/configs/msm8909/msm8909.mk
+++ b/configs/msm8909/msm8909.mk
@@ -3,8 +3,6 @@
 
 BOARD_USES_ALSA_AUDIO := true
 
-#TODO move this cchange to device/qcom/msm8909
-
 ifneq ($(TARGET_USES_AOSP_FOR_AUDIO), true)
 USE_CUSTOM_AUDIO_POLICY := 1
 AUDIO_FEATURE_ENABLED_COMPRESS_VOIP := true
@@ -13,12 +11,10 @@ AUDIO_FEATURE_ENABLED_EXTN_FLAC_DECODER := true
 AUDIO_FEATURE_ENABLED_EXTN_RESAMPLER := true
 AUDIO_FEATURE_ENABLED_FM_POWER_OPT := true
 AUDIO_FEATURE_ENABLED_PROXY_DEVICE := true
-#TODO Enable SSR
-#AUDIO_FEATURE_ENABLED_SSR := true
+AUDIO_FEATURE_ENABLED_SSR := false
 AUDIO_FEATURE_ENABLED_VOICE_CONCURRENCY := true
 AUDIO_FEATURE_ENABLED_RECORD_PLAY_CONCURRENCY := true
-#TODO Enable PM
-#AUDIO_FEATURE_ENABLED_PM_SUPPORT := true
+AUDIO_FEATURE_ENABLED_PM_SUPPORT := true
 AUDIO_FEATURE_ENABLED_DS2_DOLBY_DAP := false
 MM_AUDIO_ENABLED_SAFX := true
 DOLBY_ENABLE := false
@@ -133,7 +129,11 @@ vendor.audio.sys.init=false
 
 #Enable DS2 feature for Dolby
 PRODUCT_PROPERTY_OVERRIDES += \
-vendor.audio.dolby.ds2.enabled=true
+vendor.audio.dolby.ds2.enabled=false
+
+#split  a2dp
+PRODUCT_PROPERTY_OVERRIDES += \
+persist.vendor.bt.enable.splita2dp=false
 
 #split  a2dp
 PRODUCT_PROPERTY_OVERRIDES += \
diff --git a/configs/msm8998/audio_effects.conf b/configs/msm8998/audio_effects.conf
index 9daefede..ddf578f9 100644
--- a/configs/msm8998/audio_effects.conf
+++ b/configs/msm8998/audio_effects.conf
@@ -42,9 +42,6 @@ libraries {
   audio_pre_processing {
     path /vendor/lib/soundfx/libqcomvoiceprocessing.so
   }
-  loudness_enhancer {
-    path /vendor/lib/soundfx/libldnhncr.so
-  }
   volume_listener {
     path /vendor/lib/soundfx/libvolumelistener.so
   }
diff --git a/configs/sdm660/audio_effects.conf b/configs/sdm660/audio_effects.conf
index cc80e31d..7de84e88 100644
--- a/configs/sdm660/audio_effects.conf
+++ b/configs/sdm660/audio_effects.conf
@@ -42,9 +42,6 @@ libraries {
   audio_pre_processing {
     path /vendor/lib/soundfx/libqcomvoiceprocessing.so
   }
-  loudness_enhancer {
-    path /vendor/lib/soundfx/libldnhncr.so
-  }
   volume_listener {
     path /vendor/lib/soundfx/libvolumelistener.so
   }
diff --git a/configs/sdm660/mixer_paths.xml b/configs/sdm660/mixer_paths.xml
index ad417bb1..8cca4598 100644
--- a/configs/sdm660/mixer_paths.xml
+++ b/configs/sdm660/mixer_paths.xml
@@ -160,7 +160,6 @@
     <ctl name="I2S TX2 INP1" value="ZERO" />
     <ctl name="I2S TX2 INP2" value="ZERO" />
     <ctl name="INT4_MI2S_RX Audio Mixer MultiMedia4" value="0" />
-    <ctl name="ADC1_INP1 Switch" value="0" />
     <ctl name="HDMI Mixer MultiMedia4" value="0" />
     <ctl name="INT4_MI2S_RX_VI_FB_MONO_CH_MUX" value="ZERO" />
     <ctl name="INT4_MI2S_RX_VI_FB_STEREO_CH_MUX" value="ZERO" />
@@ -1586,7 +1585,6 @@
     <path name="adc1">
         <ctl name="ADC1 Volume" value="6" />
         <ctl name="DEC1 MUX" value="ADC1" />
-        <ctl name="ADC1_INP1 Switch" value="1" />
     </path>
 
     <path name="adc2">
diff --git a/configs/sdm660/mixer_paths_mtp.xml b/configs/sdm660/mixer_paths_mtp.xml
index ef6a5b08..4f612244 100644
--- a/configs/sdm660/mixer_paths_mtp.xml
+++ b/configs/sdm660/mixer_paths_mtp.xml
@@ -159,7 +159,6 @@
     <ctl name="I2S TX2 INP1" value="ZERO" />
     <ctl name="I2S TX2 INP2" value="ZERO" />
     <ctl name="INT4_MI2S_RX Audio Mixer MultiMedia4" value="0" />
-    <ctl name="ADC1_INP1 Switch" value="0" />
     <ctl name="HDMI Mixer MultiMedia4" value="0" />
     <ctl name="INT4_MI2S_RX_VI_FB_MONO_CH_MUX" value="ZERO" />
     <ctl name="INT4_MI2S_RX_VI_FB_STEREO_CH_MUX" value="ZERO" />
@@ -1705,7 +1704,6 @@
     <path name="adc1">
         <ctl name="ADC1 Volume" value="6" />
         <ctl name="DEC1 MUX" value="ADC1" />
-        <ctl name="ADC1_INP1 Switch" value="1" />
     </path>
 
     <path name="adc2">
diff --git a/configs/sdm660/mixer_paths_skush.xml b/configs/sdm660/mixer_paths_skush.xml
index 7986132d..aa81e7bc 100644
--- a/configs/sdm660/mixer_paths_skush.xml
+++ b/configs/sdm660/mixer_paths_skush.xml
@@ -150,7 +150,6 @@
     <ctl name="INT3_MI2S_TX Channels" value="One" />
     <ctl name="I2S TX2 INP1" value="ZERO" />
     <ctl name="I2S TX2 INP2" value="ZERO" />
-    <ctl name="ADC1_INP1 Switch" value="0" />
     <ctl name="INT4_MI2S_RX Audio Mixer MultiMedia4" value="0" />
     <ctl name="HDMI Mixer MultiMedia4" value="0" />
     <ctl name="INT4_MI2S_RX_VI_FB_MONO_CH_MUX" value="ZERO" />
@@ -1763,7 +1762,6 @@
     <path name="adc1">
         <ctl name="ADC1 Volume" value="6" />
         <ctl name="DEC1 MUX" value="ADC1" />
-        <ctl name="ADC1_INP1 Switch" value="1" />
     </path>
 
     <path name="adc2">
diff --git a/configs/sdm845/audio_effects.conf b/configs/sdm845/audio_effects.conf
index 9daefede..ddf578f9 100644
--- a/configs/sdm845/audio_effects.conf
+++ b/configs/sdm845/audio_effects.conf
@@ -42,9 +42,6 @@ libraries {
   audio_pre_processing {
     path /vendor/lib/soundfx/libqcomvoiceprocessing.so
   }
-  loudness_enhancer {
-    path /vendor/lib/soundfx/libldnhncr.so
-  }
   volume_listener {
     path /vendor/lib/soundfx/libvolumelistener.so
   }
diff --git a/hal/audio_extn/audio_extn.c b/hal/audio_extn/audio_extn.c
index 2e632447..84de66fe 100644
--- a/hal/audio_extn/audio_extn.c
+++ b/hal/audio_extn/audio_extn.c
@@ -1253,11 +1253,7 @@ int audio_extn_check_and_set_multichannel_usecase(struct audio_device *adev,
     bool ssr_supported = false;
     ssr_supported = audio_extn_ssr_check_usecase(in);
     if (ssr_supported) {
-        int ret;
-        pthread_mutex_lock(&adev->lock);
-        ret = audio_extn_ssr_set_usecase(in, config, update_params);
-        pthread_mutex_unlock(&adev->lock);
-        return ret;
+        return audio_extn_ssr_set_usecase(in, config, update_params);
     } else {
         return audio_extn_set_multichannel_mask(adev, in, config,
                                                 update_params);
diff --git a/hal/audio_extn/utils.c b/hal/audio_extn/utils.c
index 0686d64b..53568ef6 100644
--- a/hal/audio_extn/utils.c
+++ b/hal/audio_extn/utils.c
@@ -2235,7 +2235,7 @@ int audio_extn_utils_set_downmix_params(
     int ret = -EINVAL, i = 0, j = 0;
     struct audio_usecase *usecase = NULL;
 
-    if (mm_params == NULL || out == NULL) {
+    if (mm_params == NULL && out != NULL) {
         ALOGE("%s:: Invalid mix matrix params", __func__);
         goto exit;
     }
@@ -2247,11 +2247,6 @@ int audio_extn_utils_set_downmix_params(
         goto exit;
 
     usecase = get_usecase_from_list(out->dev, out->usecase);
-    if (usecase == NULL) {
-        ALOGE("%s: Invalid usecase", __func__);
-        goto exit;
-    }
-
     out->downmix_params.num_output_channels = mm_params->num_output_channels;
     out->downmix_params.num_input_channels = mm_params->num_input_channels;
 
diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index 10aff2d9..9602c1ce 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -2845,10 +2845,6 @@ int start_output_stream(struct stream_out *out)
     if (ret == 0) {
         register_out_stream(out);
         if (out->realtime) {
-            if (out->pcm == NULL || !pcm_is_ready(out->pcm)) {
-                ALOGE("%s: pcm stream not ready", __func__);
-                goto error_open;
-            }
             ret = pcm_start(out->pcm);
             if (ret < 0)
                 goto error_open;
@@ -6469,7 +6465,6 @@ static void adev_close_input_stream(struct audio_hw_device *dev,
     } else
         in_standby(&stream->common);
 
-    pthread_mutex_lock(&adev->lock);
     if (audio_extn_ssr_get_stream() == in) {
         audio_extn_ssr_deinit();
     }
@@ -6486,7 +6481,6 @@ static void adev_close_input_stream(struct audio_hw_device *dev,
         audio_extn_sound_trigger_stop_lab(in);
     }
     free(stream);
-    pthread_mutex_unlock(&adev->lock);
     return;
 }
 
diff --git a/policy_hal/AudioPolicyManager.cpp b/policy_hal/AudioPolicyManager.cpp
index c3ad9428..be6fccb8 100644
--- a/policy_hal/AudioPolicyManager.cpp
+++ b/policy_hal/AudioPolicyManager.cpp
@@ -1390,7 +1390,7 @@ status_t AudioPolicyManagerCustom::getOutputForAttr(const audio_attributes_t *at
                                                     uid_t uid,
                                                     const audio_config_t *config,
                                                     audio_output_flags_t flags,
-                                                    audio_port_handle_t selectedDeviceId,
+                                                    audio_port_handle_t *selectedDeviceId,
                                                     audio_port_handle_t *portId)
 {
     audio_offload_info_t tOffloadInfo = AUDIO_INFO_INITIALIZER;
@@ -1416,7 +1416,7 @@ status_t AudioPolicyManagerCustom::getOutputForAttr(const audio_attributes_t *at
 
     return AudioPolicyManager::getOutputForAttr(attr, output, session, stream,
                                                 (uid_t)uid, &tConfig,
-                                                flags, (audio_port_handle_t)selectedDeviceId,
+                                                flags, selectedDeviceId,
                                                 portId);
 }
 
@@ -1940,7 +1940,7 @@ status_t AudioPolicyManagerCustom::getInputForAttr(const audio_attributes_t *att
                                          uid_t uid,
                                          const audio_config_base_t *config,
                                          audio_input_flags_t flags,
-                                         audio_port_handle_t selectedDeviceId,
+                                         audio_port_handle_t *selectedDeviceId,
                                          input_type_t *inputType,
                                          audio_port_handle_t *portId)
 {
diff --git a/policy_hal/AudioPolicyManager.h b/policy_hal/AudioPolicyManager.h
index 433380bb..3b183a29 100644
--- a/policy_hal/AudioPolicyManager.h
+++ b/policy_hal/AudioPolicyManager.h
@@ -98,7 +98,7 @@ public:
                                          uid_t uid,
                                          const audio_config_base_t *config,
                                          audio_input_flags_t flags,
-                                         audio_port_handle_t selectedDeviceId,
+                                         audio_port_handle_t *selectedDeviceId,
                                          input_type_t *inputType,
                                          audio_port_handle_t *portId);
         // indicates to the audio policy manager that the input starts being used.
@@ -179,7 +179,7 @@ private:
                 uid_t uid,
                 const audio_config_t *config,
                 audio_output_flags_t flags,
-                audio_port_handle_t selectedDeviceId,
+                audio_port_handle_t *selectedDeviceId,
                 audio_port_handle_t *portId);
         // Used for voip + voice concurrency usecase
         int mPrevPhoneState;
diff --git a/post_proc/equalizer.c b/post_proc/equalizer.c
index c1c13039..45f8eb84 100644
--- a/post_proc/equalizer.c
+++ b/post_proc/equalizer.c
@@ -366,7 +366,6 @@ int equalizer_set_parameter(effect_context_t *context, effect_param_t *p,
     equalizer_context_t *eq_ctxt = (equalizer_context_t *)context;
     int voffset = ((p->psize - 1) / sizeof(int32_t) + 1) * sizeof(int32_t);
     void *value = p->data + voffset;
-    int32_t vsize = (int32_t) p->vsize;
     int32_t *param_tmp = (int32_t *)p->data;
     int32_t param = *param_tmp++;
     int32_t preset;
@@ -380,10 +379,6 @@ int equalizer_set_parameter(effect_context_t *context, effect_param_t *p,
 
     switch (param) {
     case EQ_PARAM_CUR_PRESET:
-        if (vsize < sizeof(int16_t)) {
-           p->status = -EINVAL;
-           break;
-        }
         preset = (int32_t)(*(uint16_t *)value);
 
         if ((preset >= equalizer_get_num_presets(eq_ctxt)) || (preset < 0)) {
@@ -393,10 +388,6 @@ int equalizer_set_parameter(effect_context_t *context, effect_param_t *p,
         equalizer_set_preset(eq_ctxt, preset);
         break;
     case EQ_PARAM_BAND_LEVEL:
-        if (vsize < sizeof(int16_t)) {
-            p->status = -EINVAL;
-            break;
-        }
         band =  *param_tmp;
         level = (int32_t)(*(int16_t *)value);
         if (band < 0 || band >= NUM_EQ_BANDS) {
@@ -410,10 +401,6 @@ int equalizer_set_parameter(effect_context_t *context, effect_param_t *p,
         equalizer_set_band_level(eq_ctxt, band, level);
         break;
     case EQ_PARAM_PROPERTIES: {
-        if (vsize < sizeof(int16_t)) {
-            p->status = -EINVAL;
-            break;
-        }
         int16_t *prop = (int16_t *)value;
         if ((int)prop[0] >= equalizer_get_num_presets(eq_ctxt)) {
             p->status = -EINVAL;
@@ -422,13 +409,6 @@ int equalizer_set_parameter(effect_context_t *context, effect_param_t *p,
         if (prop[0] >= 0) {
             equalizer_set_preset(eq_ctxt, (int)prop[0]);
         } else {
-            if (vsize < (2 + NUM_EQ_BANDS) * sizeof(int16_t)) {
-                android_errorWriteLog(0x534e4554, "37563371");
-                ALOGE("\tERROR EQ_PARAM_PROPERTIES valueSize %d < %d",
-                                  vsize, (2 + NUM_EQ_BANDS) * sizeof(int16_t));
-                p->status = -EINVAL;
-                break;
-            }
             if ((int)prop[1] != NUM_EQ_BANDS) {
                 p->status = -EINVAL;
                 break;