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

Merge "Fix soundtrigger test, adds null pointer check" into nyc-dev

Browse Source
This commit is contained in:
Ryan Bavetta
2016-03-03 03:46:09 +00:00
committed by Android (Google) Code Review
parent 3b8db2dc0e ea04e8fe75
commit 840c617c38
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -689,12 +689,19 @@ public class SoundTrigger {
return false;
if (triggerInData != other.triggerInData)
return false;
if (captureFormat.getSampleRate() != other.captureFormat.getSampleRate())
return false;
if (captureFormat.getEncoding() != other.captureFormat.getEncoding())
return false;
if (captureFormat.getChannelMask() != other.captureFormat.getChannelMask())
return false;
if (captureFormat == null) {
if (other.captureFormat != null)
return false;
} else {
if (other.captureFormat == null)
return false;
if (captureFormat.getSampleRate() != other.captureFormat.getSampleRate())
return false;
if (captureFormat.getEncoding() != other.captureFormat.getEncoding())
return false;
if (captureFormat.getChannelMask() != other.captureFormat.getChannelMask())
return false;
}
return true;
}
@@ -1002,10 +1009,10 @@ public class SoundTrigger {
int encoding = in.readInt();
int channelMask = in.readInt();
captureFormat = (new AudioFormat.Builder())
.setChannelMask(channelMask)
.setEncoding(encoding)
.setSampleRate(sampleRate)
.build();
.setChannelMask(channelMask)
.setEncoding(encoding)
.setSampleRate(sampleRate)
.build();
}
byte[] data = in.readBlob();
KeyphraseRecognitionExtra[] keyphraseExtras =