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

Commit d4e6ec0e authored by Nicolo' Mazzucato's avatar Nicolo' Mazzucato
Browse files

Fix onHandleAssist behaviour when showSession is called with flags = 0 

The code to handle voice interaction sessions had two problems:

1. it was not handling correctly the case where
VoiceInteractionSessionConnection.showLocked was called before a session
started, without requiring any assist data (flags = 0).
Now, when the session is set in VoiceInteractionSessionConnection,
the pending `onHandleAssist` are called.

2. AssistState delivered with `onHandleAssist` had the wrong IBinder
inside ActivityId. it contained ActivityRecord.appToken, but to work
properly ActivityRecord.assistToken was required. Tests have been updated
to catch this (atest CtsVoiceInteractionTestCases).

Bug: 178020517
Test: atest CtsAssistTestCases
Test: atest CtsVoiceInteractionTestCases
Change-Id: Id10937f0655d6837ccb85250c369bdeccd261ed8
parent 9f15b8d1

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

0 → 100644
+52 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2021 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.server.wm;



import android.os.IBinder;



/**

 * Class needed to expose some {@link ActivityRecord} fields in order to provide

 * {@link android.service.voice.VoiceInteractionSession#onHandleAssist(AssistState)}

 *

 * @hide

 */

public class ActivityAssistInfo {

    private final IBinder mActivityToken;

    private final IBinder mAssistToken;

    private final int mTaskId;



    public ActivityAssistInfo(ActivityRecord activityRecord) {

        this.mActivityToken = activityRecord.appToken;

        this.mAssistToken = activityRecord.assistToken;

        this.mTaskId = activityRecord.getTask().mTaskId;

    }



    /** @hide */

    public IBinder getActivityToken() {

        return mActivityToken;

    }



    /** @hide */

    public IBinder getAssistToken() {

        return mAssistToken;

    }



    /** @hide */

    public int getTaskId() {

        return mTaskId;

    }

}

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

+1 −2
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ import android.os.Bundle; 
import android.os.IBinder;

import android.os.RemoteException;

import android.service.voice.IVoiceInteractionSession;

import android.util.Pair;

import android.util.proto.ProtoOutputStream;

import android.window.TaskSnapshot;
@@ -166,7 +165,7 @@ public abstract class ActivityTaskManagerInternal { 
     * Returns the top activity from each of the currently visible root tasks, and the related task

     * id. The first entry will be the focused activity.

     */

    public abstract List<Pair<IBinder, Integer>> getTopVisibleActivities();

    public abstract List<ActivityAssistInfo> getTopVisibleActivities();



    /**

     * Returns whether {@code uid} has any resumed activity.

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

+1 −2
Original line number Diff line number Diff line
@@ -215,7 +215,6 @@ import android.text.format.TimeMigrationUtils; 
import android.util.ArrayMap;

import android.util.ArraySet;

import android.util.Log;

import android.util.Pair;

import android.util.Slog;

import android.util.SparseArray;

import android.util.TimeUtils;
@@ -5075,7 +5074,7 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
        }



        @Override

        public List<Pair<IBinder, Integer>> getTopVisibleActivities() {

        public List<ActivityAssistInfo> getTopVisibleActivities() {

            synchronized (mGlobalLock) {

                return mRootWindowContainer.getTopVisibleActivities();

            }

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

+3 −4
Original line number Diff line number Diff line
@@ -1817,8 +1817,8 @@ class RootWindowContainer extends WindowContainer<DisplayContent> 
     * @return a list of pairs, containing activities and their task id which are the top ones in

     * each visible root task. The first entry will be the focused activity.

     */

    List<Pair<IBinder, Integer>> getTopVisibleActivities() {

        final ArrayList<Pair<IBinder, Integer>> topVisibleActivities = new ArrayList<>();

    List<ActivityAssistInfo> getTopVisibleActivities() {

        final ArrayList<ActivityAssistInfo> topVisibleActivities = new ArrayList<>();

        final Task topFocusedRootTask = getTopDisplayFocusedRootTask();

        // Traverse all displays.

        forAllRootTasks(rootTask -> {
@@ -1826,8 +1826,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent> 
            if (rootTask.shouldBeVisible(null /* starting */)) {

                final ActivityRecord top = rootTask.getTopNonFinishingActivity();

                if (top != null) {

                    Pair<IBinder, Integer> visibleActivity = new Pair<>(top.appToken,

                            top.getTask().mTaskId);

                    ActivityAssistInfo visibleActivity = new ActivityAssistInfo(top);

                    if (rootTask == topFocusedRootTask) {

                        topVisibleActivities.add(0, visibleActivity);

                    } else {

services/voiceinteraction/TEST_MAPPING

+8 −0
Original line number Diff line number Diff line
@@ -7,6 +7,14 @@ 
          "exclude-annotation": "androidx.test.filters.FlakyTest"

        }

      ]

    },

    {

      "name": "CtsAssistTestCases",

      "options": [

        {

          "exclude-annotation": "androidx.test.filters.FlakyTest"

        }

      ]

    }

  ]

}