diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2015-07-06 16:18:11 -0700 |
|---|---|---|
| committer | Jorim Jaggi <jjaggi@google.com> | 2015-07-08 22:26:24 +0000 |
| commit | 165ce066b701ba0153000f0692bfc7032655d17d (patch) | |
| tree | f557490ccff7c7dd1787fedd40540d6ccd35d5a3 /services/voiceinteraction | |
| parent | 588932a53e63c0a7ee281dea22559c129b40eb99 (diff) | |
| download | frameworks_base-165ce066b701ba0153000f0692bfc7032655d17d.zip frameworks_base-165ce066b701ba0153000f0692bfc7032655d17d.tar.gz frameworks_base-165ce066b701ba0153000f0692bfc7032655d17d.tar.bz2 | |
Fix assist for hardware long-press
Activating the assistant will now route through SysUI, so
we have the logic whether to start an activity or to start a voice
interaction session in one single place.
Bug: 22201770
Change-Id: I0f4699533aea2a1e595ee25a844434c82f548c01
Diffstat (limited to 'services/voiceinteraction')
| -rw-r--r-- | services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java index 61ae1c0..36478da 100644 --- a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java +++ b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java @@ -761,7 +761,8 @@ public class VoiceInteractionManagerService extends SystemService { } @Override - public void showSessionForActiveService(IVoiceInteractionSessionShowCallback showCallback) { + public void showSessionForActiveService(Bundle args, + IVoiceInteractionSessionShowCallback showCallback) { enforceCallingPermission(Manifest.permission.ACCESS_VOICE_INTERACTION_SERVICE); synchronized (this) { if (mImpl == null) { @@ -771,7 +772,7 @@ public class VoiceInteractionManagerService extends SystemService { } final long caller = Binder.clearCallingIdentity(); try { - mImpl.showSessionLocked(new Bundle() /* sessionArgs */, + mImpl.showSessionLocked(args, VoiceInteractionSession.SHOW_SOURCE_ASSIST_GESTURE | VoiceInteractionSession.SHOW_WITH_ASSIST | VoiceInteractionSession.SHOW_WITH_SCREENSHOT, |