summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2015-03-13 18:02:54 -0700
committerDianne Hackborn <hackbod@google.com>2015-03-16 11:29:12 -0700
commit3d07c94c393831091958fe6a98811843db8973bd (patch)
tree0cd5c4ea3dc580772b28ef76e9b5b76fe23de081 /Android.mk
parent872d191e6134b429f833013b8706c7b54ebd0d2a (diff)
downloadframeworks_base-3d07c94c393831091958fe6a98811843db8973bd.zip
frameworks_base-3d07c94c393831091958fe6a98811843db8973bd.tar.gz
frameworks_base-3d07c94c393831091958fe6a98811843db8973bd.tar.bz2
Add new voice request for picking from a list.
Also add API for voice interaction service to control whether the system should hold a wake lock while it is working with an activity (and actually *do* hold a wake lock while doing so, duh!). And while in there, clean up the launching wake lock to correctly give blame to the app that is launching. Change-Id: I7cc4d566b80f59fe0a9ac51ae9bbb7188a01f433
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index 452d72c..84cad4e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -559,6 +559,7 @@ aidl_files := \
frameworks/base/core/java/android/app/PendingIntent.aidl \
frameworks/base/core/java/android/app/AlarmManager.aidl \
frameworks/base/core/java/android/app/SearchableInfo.aidl \
+ frameworks/base/core/java/android/app/VoiceInteractor.aidl \
frameworks/base/core/java/android/app/job/JobParameters.aidl \
frameworks/base/core/java/android/app/job/JobInfo.aidl \
frameworks/base/core/java/android/appwidget/AppWidgetProviderInfo.aidl \