diff options
| author | rioskao <rioskao@google.com> | 2020-06-08 17:40:31 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-08 17:40:31 +0000 |
| commit | acb0b32e8f4369a97c33f49540d69852fc2cdc8e (patch) | |
| tree | 42707a5bbf7a2139690191296b68a75acb3b1c8e | |
| parent | de1c0d6ce347ee32e396e6dea0ca55f78e0861fb (diff) | |
| parent | f32bf0d37de9e99b7703177590498320d84aa9f9 (diff) | |
| download | sound_trigger_hal-acb0b32e8f4369a97c33f49540d69852fc2cdc8e.tar.gz | |
sthal: fix vts test failure am: f32bf0d37dandroid-mainline-12.0.0_r112android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12aml_tz2_305400500aml_tz2_305400300aml_tz2_305400100aml_tz2_304500300aml_tz2_303900110aml_tz2_303900102aml_tz2_303800002aml_tz2_303800001aml_tz2_303200001android12-mainline-tzdata2-releaseandroid11-mainline-tethering-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseaml_tz2_305400100
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/knowles/athletico/sound_trigger_hal/+/11716878
Change-Id: If9ab0940e549e1e0c617ebf90f74bafb728250cb
| -rw-r--r-- | sound_trigger_hw_iaxxx.c | 8 |
1 files changed, 7 insertions, 1 deletions
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 @@ static int stdev_load_sound_model(const struct sound_trigger_hw_device *dev, 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 @@ static int stdev_load_sound_model(const struct sound_trigger_hw_device *dev, 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. |