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

Commit da2818fe authored by Winson Chung's avatar Winson Chung
Browse files

1/ Refactor out logic to fetch assist data asynchronously 

- This logic will also be used when the recents component is started to
  fetch assist data associated with the current activity.

Bug: 67864419
Test: com.android.server.am.AssistDataRequesterTest
Test: CtsVoiceInteractionTestCases

Change-Id: I4cb3c2536a104d7071bc0a1fd6e31dfc2c0ce8d0
parent 35c1a5d5

Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -380,7 +380,7 @@ LOCAL_SRC_FILES += \ 
	core/java/android/speech/tts/ITextToSpeechService.aidl \

	core/java/com/android/internal/app/IAppOpsCallback.aidl \

	core/java/com/android/internal/app/IAppOpsService.aidl \

	core/java/com/android/internal/app/IAssistScreenshotReceiver.aidl \

	core/java/com/android/internal/app/IAssistDataReceiver.aidl \

	core/java/com/android/internal/app/IBatteryStats.aidl \

	core/java/com/android/internal/app/ISoundTriggerService.aidl \

	core/java/com/android/internal/app/IVoiceInteractionManagerService.aidl \

core/java/android/app/IActivityManager.aidl

+3 −2
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ import android.os.ParcelFileDescriptor; 
import android.os.PersistableBundle;

import android.os.StrictMode;

import android.service.voice.IVoiceInteractionSession;

import com.android.internal.app.IAssistDataReceiver;

import com.android.internal.app.IVoiceInteractor;

import com.android.internal.os.IResultReceiver;

import com.android.internal.policy.IKeyguardDismissCallback;
@@ -453,7 +454,7 @@ interface IActivityManager { 
    void notifyCleartextNetwork(int uid, in byte[] firstPacket);

    int createStackOnDisplay(int displayId);

    void setTaskResizeable(int taskId, int resizeableMode);

    boolean requestAssistContextExtras(int requestType, in IResultReceiver receiver,

    boolean requestAssistContextExtras(int requestType, in IAssistDataReceiver receiver,

            in Bundle receiverExtras, in IBinder activityToken,

            boolean focused, boolean newSessionId);

    void resizeTask(int taskId, in Rect bounds, int resizeMode);
@@ -617,7 +618,7 @@ interface IActivityManager { 
    boolean updateDisplayOverrideConfiguration(in Configuration values, int displayId);

    void unregisterTaskStackListener(ITaskStackListener listener);

    void moveStackToDisplay(int stackId, int displayId);

    boolean requestAutofillData(in IResultReceiver receiver, in Bundle receiverExtras,

    boolean requestAutofillData(in IAssistDataReceiver receiver, in Bundle receiverExtras,

                                in IBinder activityToken, int flags);

    void dismissKeyguard(in IBinder token, in IKeyguardDismissCallback callback);

    int restartUserInBackground(int userId);

core/java/android/view/IWindowManager.aidl

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package android.view;



import com.android.internal.app.IAssistScreenshotReceiver;

import com.android.internal.app.IAssistDataReceiver;

import com.android.internal.os.IResultReceiver;

import com.android.internal.view.IInputContext;

import com.android.internal.view.IInputMethodClient;
@@ -272,7 +272,7 @@ interface IWindowManager 
    /**

     * Used only for assist -- request a screenshot of the current application.

     */

    boolean requestAssistScreenshot(IAssistScreenshotReceiver receiver);

    boolean requestAssistScreenshot(IAssistDataReceiver receiver);



    /**

     * Called by the status bar to notify Views of changes to System UI visiblity.

core/java/com/android/internal/app/IAssistScreenshotReceiver.aidl→core/java/com/android/internal/app/IAssistDataReceiver.aidl

+5 −3
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2015 The Android Open Source Project

 * Copyright (C) 2017 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.
@@ -17,8 +17,10 @@ 
package com.android.internal.app;



import android.graphics.Bitmap;

import android.os.Bundle;



/** @hide */

oneway interface IAssistScreenshotReceiver {

    void send(in Bitmap screenshot);

oneway interface IAssistDataReceiver {

    void onHandleAssistData(in Bundle resultData);

    void onHandleAssistScreenshot(in Bitmap screenshot);

}

services/autofill/java/com/android/server/autofill/Session.java

+9 −3
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ import android.content.ComponentName; 
import android.content.Context;

import android.content.Intent;

import android.content.IntentSender;

import android.graphics.Bitmap;

import android.graphics.Rect;

import android.metrics.LogMaker;

import android.os.Binder;
@@ -76,11 +77,11 @@ import android.view.autofill.IAutoFillManagerClient; 
import android.view.autofill.IAutofillWindowPresenter;



import com.android.internal.R;

import com.android.internal.app.IAssistDataReceiver;

import com.android.internal.annotations.GuardedBy;

import com.android.internal.logging.MetricsLogger;

import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

import com.android.internal.os.HandlerCaller;

import com.android.internal.os.IResultReceiver;

import com.android.internal.util.ArrayUtils;

import com.android.server.autofill.ui.AutoFillUI;

import com.android.server.autofill.ui.PendingUi;
@@ -206,9 +207,9 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState 
    /**

     * Receiver of assist data from the app's {@link Activity}.

     */

    private final IResultReceiver mAssistReceiver = new IResultReceiver.Stub() {

    private final IAssistDataReceiver mAssistReceiver = new IAssistDataReceiver.Stub() {

        @Override

        public void send(int resultCode, Bundle resultData) throws RemoteException {

        public void onHandleAssistData(Bundle resultData) throws RemoteException {

            final AssistStructure structure = resultData.getParcelable(KEY_STRUCTURE);

            if (structure == null) {

                Slog.e(TAG, "No assist structure - app might have crashed providing it");
@@ -264,6 +265,11 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState 


            mRemoteFillService.onFillRequest(request);

        }



        @Override

        public void onHandleAssistScreenshot(Bitmap screenshot) {

            // Do nothing

        }

    };



    /**