Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Give extras bundle to showSessionForActiveService" into rvc-dev am: 4e46cf22a4

Browse Source 
Change-Id: Ib8b49ea8c7c2616e48b86cb16d86b37311fe9e85
This commit is contained in:
Galia Peycheva
2020-05-15 15:48:17 +00:00
committed by Automerger Merge Worker
parent cb22ae7775 4e46cf22a4
commit d82309a934
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/wm/ActivityTaskManagerService.java
View File

@@ -3213,7 +3213,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
if (TextUtils.equals(pae.intent.getAction(), if (TextUtils.equals(pae.intent.getAction(),
android.service.voice.VoiceInteractionService.SERVICE_INTERFACE)) { android.service.voice.VoiceInteractionService.SERVICE_INTERFACE)) {
// Start voice interaction through VoiceInteractionManagerService. // Start voice interaction through VoiceInteractionManagerService.
mAssistUtils.showSessionForActiveService(sendBundle, SHOW_SOURCE_APPLICATION, mAssistUtils.showSessionForActiveService(pae.extras, SHOW_SOURCE_APPLICATION,
null, null); null, null);
} else { } else {
pae.intent.replaceExtras(pae.extras); pae.intent.replaceExtras(pae.extras);