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

Merge \"SoundTriggerDetector should look at the return code to honour success\" into nyc-mr1-dev

Browse Source 
am: 9b550cb188

Change-Id: Iafbd6b758768fc0f87651ac9086333fa74e07fdc
This commit is contained in:
Chris Thornton
2016-07-12 23:37:18 +00:00
committed by android-build-merger
parent 6d2170ee5d 9b550cb188
commit 0359337b9b
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
media/java/android/media/soundtrigger/SoundTriggerDetector.java
View File

@@ -15,6 +15,7 @@
*/ */
package android.media.soundtrigger; package android.media.soundtrigger;
import static android.hardware.soundtrigger.SoundTrigger.STATUS_OK;
import android.annotation.IntDef; import android.annotation.IntDef;
import android.annotation.NonNull; import android.annotation.NonNull;
@@ -243,27 +244,29 @@ public final class SoundTriggerDetector {
boolean allowMultipleTriggers = boolean allowMultipleTriggers =
(recognitionFlags & RECOGNITION_FLAG_ALLOW_MULTIPLE_TRIGGERS) != 0; (recognitionFlags & RECOGNITION_FLAG_ALLOW_MULTIPLE_TRIGGERS) != 0;
int status = STATUS_OK;
try { try {
mSoundTriggerService.startRecognition(new ParcelUuid(mSoundModelId), status = mSoundTriggerService.startRecognition(new ParcelUuid(mSoundModelId),
mRecognitionCallback, new RecognitionConfig(captureTriggerAudio, mRecognitionCallback, new RecognitionConfig(captureTriggerAudio,
allowMultipleTriggers, null, null)); allowMultipleTriggers, null, null));
} catch (RemoteException e) { } catch (RemoteException e) {
return false; return false;
} }
return true; return status == STATUS_OK;
} }
/** /**
* Stops recognition for the associated model. * Stops recognition for the associated model.
*/ */
public boolean stopRecognition() { public boolean stopRecognition() {
int status = STATUS_OK;
try { try {
mSoundTriggerService.stopRecognition(new ParcelUuid(mSoundModelId), status = mSoundTriggerService.stopRecognition(new ParcelUuid(mSoundModelId),
mRecognitionCallback); mRecognitionCallback);
} catch (RemoteException e) { } catch (RemoteException e) {
return false; return false;
} }
return true; return status == STATUS_OK;
} }
/** /**