Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "SoundTrigger: fix KeyphraseRecognitionEvent parceling" into lmp-dev

Browse Source
This commit is contained in:
Eric Laurent
2014-09-13 00:21:47 +00:00
committed by Android (Google) Code Review
parent 9890084952 75b433f737
commit 76466c7be3
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/hardware/soundtrigger/SoundTrigger.java
View File

@@ -873,7 +873,7 @@ public class SoundTrigger {
int capturePreambleMs = in.readInt();
boolean triggerInData = in.readByte() == 1;
AudioFormat captureFormat = null;
if (triggerInData) {
if (in.readByte() == 1) {
int sampleRate = in.readInt();
int encoding = in.readInt();
int channelMask = in.readInt();
@@ -899,7 +899,8 @@ public class SoundTrigger {
dest.writeInt(captureSession);
dest.writeInt(captureDelayMs);
dest.writeInt(capturePreambleMs);
if (triggerInData && (captureFormat != null)) {
dest.writeByte((byte) (triggerInData ? 1 : 0));
if (captureFormat != null) {
dest.writeByte((byte)1);
dest.writeInt(captureFormat.getSampleRate());
dest.writeInt(captureFormat.getEncoding());