commit 960b1b2fc6b9c3e7ec286b251577bb505af481dd
author Eric Laurent <elaurent@google.com> Mon Nov 13 13:02:43 2017 -0800
committer Eric Laurent <elaurent@google.com> Mon Nov 13 16:07:24 2017 -0800
tree f6ac19cc622949ed9aafe6a27b54d2460b396b6a
parent c5e5b382fecd736f5e86e1b9e4d0ca1a24280199

Soundtrigger service: fix status reporting in loadSoundModel

Fix regression introduced by commit a188af07 cherry-pick
of fix for issue b/67310830

Bug: 64340921
Bug: 67310830

Test: repro steps in b/67310830
Change-Id: Ide98d22dca3a6ed81285f8b543ea31ee69f1e61b
Merged-In: I718f47d913e1b98e567b7e1559f1f4cc1b29b231

services/soundtrigger/SoundTriggerHwService.cpp

diff --git a/services/soundtrigger/SoundTriggerHwService.cpp b/services/soundtrigger/SoundTriggerHwService.cpp
index 5ae3862..894dba0 100644
--- a/services/soundtrigger/SoundTriggerHwService.cpp
+++ b/services/soundtrigger/SoundTriggerHwService.cpp
@@ -583,11 +583,11 @@
             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;
         }