commit b82cc11dca2c21c75b6c90abae49c35603a46261
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Dec 20 17:50:19 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Dec 20 17:50:19 2018 +0000
tree 2d5893fba551c90f87ff75eab57ccb243de08199
parent ba83d1eaa2a45e3110fa00c8cd76ab35d3b19598
parent 25ed3e826ff69b939073ca0cbb810e8f262a252d

Merge "Fixing memory corruption bug in sound trigger V2_2"

soundtrigger/2.2/default/SoundTriggerHw.cpp

diff --git a/soundtrigger/2.2/default/SoundTriggerHw.cpp b/soundtrigger/2.2/default/SoundTriggerHw.cpp
index 9d930ac..3cf72c8 100644
--- a/soundtrigger/2.2/default/SoundTriggerHw.cpp
+++ b/soundtrigger/2.2/default/SoundTriggerHw.cpp
@@ -380,8 +380,8 @@
                             "malloc failed for size %zu in convertSoundModelToHal PHRASE",
                             allocSize);
 
-        const ISoundTriggerHw::PhraseSoundModel* keyPhraseModel =
-            reinterpret_cast<const ISoundTriggerHw::PhraseSoundModel*>(soundModel);
+        const V2_0::ISoundTriggerHw::PhraseSoundModel* keyPhraseModel =
+            reinterpret_cast<const V2_0::ISoundTriggerHw::PhraseSoundModel*>(soundModel);
 
         size_t i;
         for (i = 0; i < keyPhraseModel->phrases.size() && i < SOUND_TRIGGER_MAX_PHRASES; i++) {