do not merge. Revert "do not merge. Remove voicesearch-specific functionality from framework."
This reverts commit f1b64f64ab088a3e8cd32ec31f61c958c61d19e5.
It also updates RecognitionResult.java with changes made while it was in the voicesearch branch.
Change-Id: Ibffbe25397628a01ec49393a23c1825cef116501
diff --git a/Android.mk b/Android.mk
index 138ff09..4e7b14e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -126,6 +126,8 @@
core/java/android/view/IWindow.aidl \
core/java/android/view/IWindowManager.aidl \
core/java/android/view/IWindowSession.aidl \
+ core/java/android/speech/IRecognitionListener.aidl \
+ core/java/android/speech/IRecognitionService.aidl \
core/java/android/speech/tts/ITts.aidl \
core/java/android/speech/tts/ITtsCallback.aidl \
core/java/com/android/internal/app/IBatteryStats.aidl \