[automerger skipped] Merge RQ2A.210305.007 am: e21d3d9247 -s ours am: 358976caaa -s ours am: 79a6b9586b -s ours
am skip reason: Change-Id I0bcb339f01c664e59e258daf901460523b84c468 with SHA-1 d38016f885 is in history
Original change: https://android-review.googlesource.com/c/platform/hardware/knowles/athletico/sound_trigger_hal/+/1613216
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I033a76f2c7943b0021399f14f4864f897c4a7732
diff --git a/sound_trigger_hw_iaxxx.c b/sound_trigger_hw_iaxxx.c
index e3d34ff..5225091 100644
--- a/sound_trigger_hw_iaxxx.c
+++ b/sound_trigger_hw_iaxxx.c
@@ -3560,6 +3560,9 @@
stdev->device.get_properties_extended = stdev_get_properties_extended;
stdev->opened = true;
+ stdev->send_sock = -1;
+ stdev->recv_sock = -1;
+
/* Initialize all member variable */
for (i = 0; i < MAX_MODELS; i++) {
stdev->models[i].type = SOUND_MODEL_TYPE_UNKNOWN;
diff --git a/tests/oslo_config_test.c b/tests/oslo_config_test.c
index 4056218..c4f87dd 100644
--- a/tests/oslo_config_test.c
+++ b/tests/oslo_config_test.c
@@ -38,14 +38,14 @@
#define BGT60TR24C_NUM_REGISTERS 0x60
/* Oslo Calibration */
-#define CAL_FILE "/persist/oslo/oslo.cal"
+#define CAL_FILE "/mnt/vendor/persist/oslo/oslo.cal"
#define CAL_MODES_MAX 10
#define CAL_INVALID_MODE -1
#define CAL_MODE_IS_VALID(x) (x >= 0 && x < CAL_MODES_MAX)
#define CAL_VERSION_DEFAULT 1.0f
/* Transmit power */
-#define TX_CAL_FILE "/persist/oslo/tx_power.cal"
+#define TX_CAL_FILE "/mnt/vendor/persist/oslo/tx_power.cal"
typedef enum {
INJECT_MODE_OFF = 0,
