summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSandeep Siddhartha <sansid@google.com>2014-07-29 20:44:32 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-07-24 15:37:54 +0000
commitf024d30b8844b9f1fe80b71662de4fb8e4777cf0 (patch)
treeb891e3bfe34835b922258fa6ea1773b9b9f86e33
parent8b4eae77538b0ffcc3835ee908e495ad8c8b4f5b (diff)
parent2e14dd46e16432fe264025087b57ce6ec71622a3 (diff)
downloadframeworks_base-f024d30b8844b9f1fe80b71662de4fb8e4777cf0.zip
frameworks_base-f024d30b8844b9f1fe80b71662de4fb8e4777cf0.tar.gz
frameworks_base-f024d30b8844b9f1fe80b71662de4fb8e4777cf0.tar.bz2
Merge "Use keyphrase id from the recognition event" into lmp-dev
-rw-r--r--services/voiceinteraction/java/com/android/server/voiceinteraction/SoundTriggerHelper.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/services/voiceinteraction/java/com/android/server/voiceinteraction/SoundTriggerHelper.java b/services/voiceinteraction/java/com/android/server/voiceinteraction/SoundTriggerHelper.java
index cae7ca5..fe1b92a 100644
--- a/services/voiceinteraction/java/com/android/server/voiceinteraction/SoundTriggerHelper.java
+++ b/services/voiceinteraction/java/com/android/server/voiceinteraction/SoundTriggerHelper.java
@@ -255,8 +255,7 @@ public class SoundTriggerHelper implements SoundTrigger.StatusListener {
return;
}
// TODO: Handle more than one keyphrase extras.
- // TODO: Use keyphraseExtras[0].id here instead of 100.
- int keyphraseId = 100;
+ int keyphraseId = keyphraseExtras[0].id;
try {
synchronized(this) {
// Check which keyphrase triggered, and fire the appropriate event.