Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7afd4979 authored by Galia Peycheva's avatar Galia Peycheva Committed by Automerger Merge Worker
Browse files

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

Change-Id: Iaae16e00157de0a3e86fd84a0afcc10de6bcc4e7
parents c76b61c3 4e46cf22

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

+1 −1
Original line number Diff line number Diff line
@@ -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);