| commit | acb0b32e8f4369a97c33f49540d69852fc2cdc8e | [log] [tgz] |
|---|---|---|
| author | rioskao <rioskao@google.com> | Mon Jun 08 17:40:31 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jun 08 17:40:31 2020 +0000 |
| tree | 42707a5bbf7a2139690191296b68a75acb3b1c8e | |
| parent | de1c0d6ce347ee32e396e6dea0ca55f78e0861fb [diff] | |
| parent | f32bf0d37de9e99b7703177590498320d84aa9f9 [diff] |
sthal: fix vts test failure am: f32bf0d37d Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/knowles/athletico/sound_trigger_hal/+/11716878 Change-Id: If9ab0940e549e1e0c617ebf90f74bafb728250cb
diff --git a/sound_trigger_hw_iaxxx.c b/sound_trigger_hw_iaxxx.c index 91f78fc..014c96a 100644 --- a/sound_trigger_hw_iaxxx.c +++ b/sound_trigger_hw_iaxxx.c
@@ -2683,7 +2683,7 @@ int ret = 0; int kw_model_sz = 0; int i = 0; - + sound_trigger_uuid_t empty_uuid = {0}; unsigned char *kw_buffer = NULL; ALOGD("+%s+", __func__); @@ -2706,6 +2706,12 @@ goto exit; } + if (check_uuid_equality(sound_model->vendor_uuid, empty_uuid)) { + ALOGE("%s Invalid vendor uuid", __func__); + ret = -EINVAL; + goto exit; + } + // When a delayed CHRE/Oslo destroy process is in progress, // we should not skip the new model and return the existing handle // which will be destroyed soon.