commit 969f995f11991ae8c1df393324119e584ccccddd
author Galia Peycheva <galinap@google.com> Mon May 11 20:26:45 2020 +0200
committer Galia Peycheva <galinap@google.com> Wed May 13 15:37:55 2020 +0000
tree 9e03fcd336350f059f0d780626c3f37d4d3a70e2
parent 15ab8e1029675536760403be713c84953c5ac11a

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

services/core/java/com/android/server/wm/ActivityTaskManagerService.java

diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
index 36caeec..d0da914 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 @@
             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);