From 969f995f11991ae8c1df393324119e584ccccddd Mon Sep 17 00:00:00 2001 From: Galia Peycheva Date: Mon, 11 May 2020 20:26:45 +0200 Subject: [PATCH] Give extras bundle to showSessionForActiveService This used to be the case before ag/7316738, where the pae.extras got lost. launchAssistIntet doesn't set an AssistDataReceiver, which causes the sendBundle to be null, thus losing the information in pae.extras. This CL puts the pae.extras back on the assistant launch path. Fixes: 155180261 Test: m && flash && check that hold-to-talk receives mic input OR check that voiceInteractionSession.onShow has args != null Change-Id: I9b2d9f1da12576b477b94c71172f7de48c67d080 --- .../java/com/android/server/wm/ActivityTaskManagerService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java index 36caeecbfec2c..d0da9146254f3 100644 --- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java +++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java @@ -3213,7 +3213,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { if (TextUtils.equals(pae.intent.getAction(), android.service.voice.VoiceInteractionService.SERVICE_INTERFACE)) { // Start voice interaction through VoiceInteractionManagerService. - mAssistUtils.showSessionForActiveService(sendBundle, SHOW_SOURCE_APPLICATION, + mAssistUtils.showSessionForActiveService(pae.extras, SHOW_SOURCE_APPLICATION, null, null); } else { pae.intent.replaceExtras(pae.extras);