diff options
| author | Eric Laurent <elaurent@google.com> | 2017-12-06 01:13:25 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-12-06 01:13:25 +0000 |
| commit | 1d07dcb4f9d4b6fcd723b127adcb2c0dadb212a9 (patch) | |
| tree | d7fe6445bc2dc26e6147a889ce8c302ddfb7a160 /services | |
| parent | eed6cda723ecf9a140755713487fb3aeee7cb574 (diff) | |
| parent | 8d6ba121ad0a6fd551cbee78a71ed667139c2319 (diff) | |
| download | frameworks_av-1d07dcb4f9d4b6fcd723b127adcb2c0dadb212a9.tar.gz frameworks_av-1d07dcb4f9d4b6fcd723b127adcb2c0dadb212a9.tar.bz2 frameworks_av-1d07dcb4f9d4b6fcd723b127adcb2c0dadb212a9.zip | |
Merge "Soundtrigger service: fix status reporting in loadSoundModel" into lmp-mr1-dev am: c558af3f42
am: 8d6ba121ad
Change-Id: I061b1ee5d751fa97b495f6048790b720f5e84d26
Diffstat (limited to 'services')
| -rw-r--r-- | services/soundtrigger/SoundTriggerHwService.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/services/soundtrigger/SoundTriggerHwService.cpp b/services/soundtrigger/SoundTriggerHwService.cpp index 84d6c16a7b..9fc8d140f2 100644 --- a/services/soundtrigger/SoundTriggerHwService.cpp +++ b/services/soundtrigger/SoundTriggerHwService.cpp @@ -583,11 +583,11 @@ status_t SoundTriggerHwService::Module::loadSoundModel(const sp<IMemory>& modelM unloadSoundModel_l(mModels.valueAt(0)->mHandle, &freedSession); } - status_t status = mHwDevice->load_sound_model(mHwDevice, - sound_model, - SoundTriggerHwService::soundModelCallback, - this, - handle); + status = mHwDevice->load_sound_model(mHwDevice, + sound_model, + SoundTriggerHwService::soundModelCallback, + this, + handle); if (status != NO_ERROR) { goto exit; } |