diff options
author | Tim Kilbourn <tkilbourn@google.com> | 2015-06-05 16:18:09 -0700 |
---|---|---|
committer | Tim Kilbourn <tkilbourn@google.com> | 2015-06-05 23:26:39 +0000 |
commit | 0e5f110fc915a9b044eb04cd07ae7ac588eacc8f (patch) | |
tree | e671eecf7529eff338bb38d8638d82d01814e938 /services/core/java/com/android/server/search | |
parent | 3e85c1ed0cce70164dfe6f8ffa4bf3695c4ce0ba (diff) | |
download | frameworks_base-0e5f110fc915a9b044eb04cd07ae7ac588eacc8f.zip frameworks_base-0e5f110fc915a9b044eb04cd07ae7ac588eacc8f.tar.gz frameworks_base-0e5f110fc915a9b044eb04cd07ae7ac588eacc8f.tar.bz2 |
Pass an args bundle to launchAssistAction.
In order to track the input device that was used to trigger assist, the
input device id is sent as an extra in the assist intent whenever it is
available. This is particularly useful on TVs, when an app may want to
know whether the input device has a microphone.
Bug: 21666123
Change-Id: I0f8c09e2f617606bef481bdff924cb6b9b47dd12
Diffstat (limited to 'services/core/java/com/android/server/search')
-rw-r--r-- | services/core/java/com/android/server/search/SearchManagerService.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/search/SearchManagerService.java b/services/core/java/com/android/server/search/SearchManagerService.java index 2b2b2ac..dd2286f 100644 --- a/services/core/java/com/android/server/search/SearchManagerService.java +++ b/services/core/java/com/android/server/search/SearchManagerService.java @@ -34,6 +34,7 @@ import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.database.ContentObserver; import android.os.Binder; +import android.os.Bundle; import android.os.Process; import android.os.RemoteException; import android.os.UserHandle; @@ -264,7 +265,7 @@ public class SearchManagerService extends ISearchManager.Stub { } @Override - public boolean launchAssistAction(String hint, int userHandle) { + public boolean launchAssistAction(String hint, int userHandle, Bundle args) { ComponentName comp = getAssistIntent(userHandle); if (comp == null) { return false; @@ -275,7 +276,7 @@ public class SearchManagerService extends ISearchManager.Stub { intent.setComponent(comp); IActivityManager am = ActivityManagerNative.getDefault(); return am.launchAssistIntent(intent, ActivityManager.ASSIST_CONTEXT_BASIC, hint, - userHandle); + userHandle, args); } catch (RemoteException e) { } finally { Binder.restoreCallingIdentity(ident); |