commit 43970b512469691741c0cc12931aaf20be73ad75
author Nicholas Ambur <nambur@google.com> Tue Jan 14 18:54:26 2020 -0800
committer Nicholas Ambur <nambur@google.com> Tue Jan 14 18:54:26 2020 -0800
tree 2240abda65908b010060d27a0f2c5b2c75581ad1
parent d3ec82fbc41be35e19ca4e62c9adec3456bdf33c

fix parceling issue with KeyphraseSoundModel

Bug: 147646806
Test: Tested enrollment and unenrollment via bundled hotword enrollment
application.

Change-Id: I0a78d831e0949d4cf1ed97a1cd6cdaea70d8399a

core/java/android/hardware/soundtrigger/SoundTrigger.java

diff --git a/core/java/android/hardware/soundtrigger/SoundTrigger.java b/core/java/android/hardware/soundtrigger/SoundTrigger.java
index 6507ecd..6c44bdb 100644
--- a/core/java/android/hardware/soundtrigger/SoundTrigger.java
+++ b/core/java/android/hardware/soundtrigger/SoundTrigger.java
@@ -519,9 +519,9 @@
                 dest.writeInt(vendorUuid.toString().length());
                 dest.writeString(vendorUuid.toString());
             }
+            dest.writeInt(version);
             dest.writeBlob(data);
             dest.writeTypedArray(keyphrases, flags);
-            dest.writeInt(version);
         }
 
         @Override