commit 0f7d11bbaeded3bc314e8e52b85660f31541ef6f
author Linux Build Service Account <lnxbuild@localhost> Tue Apr 28 00:53:29 2020 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Apr 28 00:53:29 2020 -0700
tree 3b5e8ddf12cf3dc0b5e1e0fc98be3773925d29db
parent 22bc0e94b8be36f3ae1b55a97f6c34db08e8f7fa
parent 9c4f79378567cd05d2a87626c22686b5d5c33d38

Merge "st-hal: Prevent st_device callback handling before initialization"

sound_trigger_hw.c

diff --git a/sound_trigger_hw.c b/sound_trigger_hw.c
index 21f968e..16eded7 100644
--- a/sound_trigger_hw.c
+++ b/sound_trigger_hw.c
@@ -838,7 +838,7 @@
          *       by audio capture usecase, so need to do session pause->resume
          *       to resume tx path.
          */
-        if (!conc_allowed && stdev->session_allowed) {
+        if (!conc_allowed) {
             list_for_each(p_ses_node, &stdev->sound_model_list) {
                 p_ses = node_to_item(p_ses_node, st_session_t, list_node);
                 st_session_pause(p_ses);

st_hw_common.c

diff --git a/st_hw_common.c b/st_hw_common.c
index 3c31a2c..e0dab3d 100644
--- a/st_hw_common.c
+++ b/st_hw_common.c
@@ -3,7 +3,7 @@
  * This file contains common functionality between
  * sound trigger hw and sound trigger extension interface.
  *
- * Copyright (c) 2016, 2018-2019, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016, 2018-2020, The Linux Foundation. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
@@ -414,27 +414,24 @@
     hist_buf = (struct st_hist_buffer_info *) payload_buf;
     hist_buf->version = DEFAULT_CUSTOM_CONFIG_MINOR_VERSION;
 
+    hist_buf->pre_roll_duration_msec = p_ses->sthw_cfg.client_req_preroll;
+
+    if (p_ses->is_generic_event &&
+            p_ses->sthw_cfg.client_req_preroll < PREROLL_LEN_WARNING)
+        ALOGW("%s: Client requested small preroll length %dms",
+              __func__, p_ses->sthw_cfg.client_req_preroll);
+
     if (p_ses->sthw_cfg.client_req_hist_buf > 0) {
         hist_buf->hist_buffer_duration_msec =
             p_ses->sthw_cfg.client_req_hist_buf;
-        hist_buf->pre_roll_duration_msec = p_ses->sthw_cfg.client_req_preroll;
 
-        if (p_ses->is_generic_event) {
-            if (p_ses->sthw_cfg.client_req_hist_buf <=
-                (p_ses->sthw_cfg.client_req_preroll + KW_LEN_WARNING))
-                ALOGW("%s: Client hist buf and preroll lens leave only"
-                      "%dms for keyword", __func__,
-                      (p_ses->sthw_cfg.client_req_hist_buf -
-                       p_ses->sthw_cfg.client_req_preroll));
-
-            if (p_ses->sthw_cfg.client_req_preroll < PREROLL_LEN_WARNING)
-                ALOGW("%s: Client requested small preroll length %dms",
-                    __func__, p_ses->sthw_cfg.client_req_preroll);
-        }
+        if (p_ses->is_generic_event &&
+                p_ses->sthw_cfg.client_req_hist_buf <= KW_LEN_WARNING)
+                ALOGW("%s: Client requested small hist buf length %dms",
+                      __func__, p_ses->sthw_cfg.client_req_hist_buf);
     } else {
         hist_buf->hist_buffer_duration_msec =
             p_ses->vendor_uuid_info->kw_duration;
-        hist_buf->pre_roll_duration_msec = 0;
     }
     ALOGD("%s: history buf duration %d, preroll %d", __func__,
           hist_buf->hist_buffer_duration_msec,