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

Commit 67904b14 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove dead code: TV-specific launchAssistIntent"

parents 907af62e 90cfc393

core/java/android/app/IActivityTaskManager.aidl

+0 −2
Original line number Diff line number Diff line
@@ -275,8 +275,6 @@ interface IActivityTaskManager { 
     */

    void setLockScreenShown(boolean showingKeyguard, boolean showingAod);

    Bundle getAssistContextExtras(int requestType);

    boolean launchAssistIntent(in Intent intent, int requestType, in String hint, int userHandle,

            in Bundle args);

    boolean requestAssistContextExtras(int requestType, in IAssistDataReceiver receiver,

            in Bundle receiverExtras, in IBinder activityToken,

            boolean focused, boolean newSessionId);

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

+9 −24
Original line number Diff line number Diff line
@@ -3209,12 +3209,6 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 


        final long ident = Binder.clearCallingIdentity();

        try {

            if (TextUtils.equals(pae.intent.getAction(),

                    android.service.voice.VoiceInteractionService.SERVICE_INTERFACE)) {

                // Start voice interaction through VoiceInteractionManagerService.

                mAssistUtils.showSessionForActiveService(pae.extras, SHOW_SOURCE_APPLICATION,

                        null, null);

            } else {

            pae.intent.replaceExtras(pae.extras);

            pae.intent.setFlags(FLAG_ACTIVITY_NEW_TASK

                    | Intent.FLAG_ACTIVITY_SINGLE_TOP
@@ -3226,7 +3220,6 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
            } catch (ActivityNotFoundException e) {

                Slog.w(TAG, "No activity to handle assist action.", e);

            }

            }

        } finally {

            Binder.restoreCallingIdentity(ident);

        }
@@ -3545,14 +3538,6 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
                null, PENDING_AUTOFILL_ASSIST_STRUCTURE_TIMEOUT, flags) != null;

    }



    @Override

    public boolean launchAssistIntent(Intent intent, int requestType, String hint, int userHandle,

            Bundle args) {

        return enqueueAssistContext(requestType, intent, hint, null, null, null,

                true /* focused */, true /* newSessionId */, userHandle, args,

                PENDING_ASSIST_EXTRAS_TIMEOUT, 0) != null;

    }



    @Override

    public Bundle getAssistContextExtras(int requestType) {

        PendingAssistExtras pae = enqueueAssistContext(requestType, null, null, null,